summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ar.po316
-rw-r--r--po/ca.po294
-rw-r--r--po/cs.po304
-rw-r--r--po/da.po316
-rw-r--r--po/de.po316
-rw-r--r--po/en_GB.po316
-rw-r--r--po/eo.po289
-rw-r--r--po/es.po316
-rw-r--r--po/fi.po316
-rw-r--r--po/fr.po316
-rw-r--r--po/he.po316
-rw-r--r--po/hr.po314
-rw-r--r--po/id.po316
-rw-r--r--po/it.po316
-rw-r--r--po/ja.po314
-rw-r--r--po/nl.po314
-rw-r--r--po/pl.po316
-rw-r--r--po/pt.po316
-rw-r--r--po/pt_BR.po316
-rw-r--r--po/ru.po316
-rw-r--r--po/sk.po314
-rw-r--r--po/sv.po316
-rw-r--r--po/th.po294
-rw-r--r--po/zh_CN.po316
24 files changed, 3820 insertions, 3673 deletions
diff --git a/po/ar.po b/po/ar.po
index 3710bf45..fa5aef7b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-07-16 18:28+0000\n"
"Last-Translator: صقر بن عبدالله <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "مغادرة"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "الوصف: %s"
@@ -53,12 +52,12 @@ msgstr "إيقاف"
msgid "Sell"
msgstr "بيع"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "إلغاء"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "إنتقاء الشخصيّة"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "الاسم: %s"
@@ -86,69 +84,68 @@ msgstr "الاسم: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "المستوى: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "المستوى: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "النقود: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "السّابق"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "التّالي"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "جديد"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "حذف"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "موافق"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "إنشاء شخصيّة"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "الاسم:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "لون الشعر:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "قصّة الشعر:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "إنشاء"
@@ -542,12 +539,7 @@ msgstr "لا"
msgid "Connecting..."
msgstr "جارِ الاتّصال..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -557,7 +549,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "استخدام"
@@ -574,8 +566,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "الجردة"
@@ -583,49 +575,24 @@ msgstr "الجردة"
msgid "Drop"
msgstr "إسقاط"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "الوصف: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "التأثير: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "الاسم:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "التأثير: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "الوصف: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "تجريد من العتاد"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "استعمال العتاد"
@@ -677,7 +644,7 @@ msgid "Shortcut"
msgstr "اختصار"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "تثبيت"
@@ -807,7 +774,7 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار
msgid "Passwords do not match."
msgstr "كلمات السرّ غير متطابقة."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "خطأ"
@@ -815,20 +782,20 @@ msgstr "خطأ"
msgid "Sound"
msgstr "صوت"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "حجم صوت المؤثرّات"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "حجم صوت الموسيقا"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "تطبيق"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "تصفير النوافذ"
@@ -861,11 +828,11 @@ msgstr ""
msgid "Color:"
msgstr "لون الشعر:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "إضغط على الزرّ لبدأ المعايرة"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "معايرة"
@@ -873,28 +840,28 @@ msgstr "معايرة"
msgid "Enable joystick"
msgstr "تفعيل عصا الألعاب"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "إيقاف"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "تدوير العصا"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "حذف"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -939,7 +906,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -979,105 +946,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "حدّ FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "عتمة واجهة المستخدم"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "نصف قطر اللفّ"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "كسل اللفّ"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "مؤثّرات محيطة"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "واقف"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "منخفض"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "مرتفع"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "ملء الشاشة"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "جارِ ملء الشاشة"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "تغيير OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
@@ -1206,24 +1173,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "إضافة"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "إضافة"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "أنت تحصل على %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "أنت تقدّم:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1509,6 +1480,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1635,177 +1623,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "جارِ الاتّصال..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "جارِ الاتّصال..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "جارِ الاتّصال..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "الاسم: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "جارِ الاتّصال..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "الوصف: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "التأثير: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "الاسم:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "التأثير: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "الوصف: %s"
+
#~ msgid "Unregister"
#~ msgstr "إلغاء التسجيل"
diff --git a/po/ca.po b/po/ca.po
index 71f6c6da..0415ed64 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-07-03 17:21+0000\n"
"Last-Translator: Habari <thomas.becerril@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "sortir"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr ""
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr ""
@@ -69,13 +68,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr ""
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr ""
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr ""
@@ -85,69 +83,68 @@ msgstr ""
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, c-format
msgid "Job Level: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr ""
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr ""
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr ""
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr ""
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr ""
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "nom"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr ""
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr ""
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr ""
@@ -538,12 +535,7 @@ msgstr "no"
msgid "Connecting..."
msgstr ""
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -553,7 +545,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr ""
@@ -570,8 +562,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr ""
@@ -579,45 +571,24 @@ msgstr ""
msgid "Drop"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-msgid "Description:"
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "nom"
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-msgid "Description: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr ""
@@ -669,7 +640,7 @@ msgid "Shortcut"
msgstr ""
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr ""
@@ -795,7 +766,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr ""
@@ -803,20 +774,20 @@ msgstr ""
msgid "Sound"
msgstr ""
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -848,11 +819,11 @@ msgstr ""
msgid "Color:"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr ""
@@ -860,27 +831,27 @@ msgstr ""
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
msgid "Default"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -925,7 +896,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -965,103 +936,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1178,24 +1149,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1479,6 +1454,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1604,169 +1596,173 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
msgid "Trying to connect to account server..."
msgstr ""
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
msgid "Trying to connect to char server..."
msgstr ""
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
msgid "Trying to connect to map server..."
msgstr ""
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, c-format
msgid "Map: %s"
msgstr ""
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
msgid "Connecting to map server..."
msgstr ""
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "nom"
diff --git a/po/cs.po b/po/cs.po
index e046aad8..edceaf79 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-17 16:31+0000\n"
"Last-Translator: Lubos <alvinx12@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -33,7 +33,6 @@ msgstr ""
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Popis: %s"
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr "Prodej"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Zrušit"
@@ -69,14 +68,13 @@ msgstr "Potvrďte vymazání postavy"
msgid "Are you sure you want to delete this character?"
msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
#, fuzzy
msgid "Select Character"
msgstr "Vytvořit postavu"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Jméno: %s"
@@ -86,69 +84,68 @@ msgstr "Jméno: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Úroveň: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Úroveň: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Peníze: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Předchozí"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Další"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nová"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Odstranit"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Vytvořit postavu"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Jméno:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Barva vlasů:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Styl vlasů:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Vytvořit"
@@ -542,12 +539,7 @@ msgstr "Ne"
msgid "Connecting..."
msgstr "Připojuji se..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -557,7 +549,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr ""
@@ -574,8 +566,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventář"
@@ -583,47 +575,24 @@ msgstr "Inventář"
msgid "Drop"
msgstr "Upustit"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Jméno:"
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Vybavit"
@@ -675,7 +644,7 @@ msgid "Shortcut"
msgstr "Zkratka"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Nastavení"
@@ -802,7 +771,7 @@ msgstr "Heslo musí být kratší než %d znaků."
msgid "Passwords do not match."
msgstr "Hesla se neshodují."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Chyba"
@@ -810,20 +779,20 @@ msgstr "Chyba"
msgid "Sound"
msgstr "Zvuk"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -857,11 +826,11 @@ msgstr ""
msgid "Color:"
msgstr "Barva vlasů:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibrovat"
@@ -869,28 +838,28 @@ msgstr "Kalibrovat"
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Odstranit"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -935,7 +904,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -975,103 +944,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1197,24 +1166,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1499,6 +1472,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1625,177 +1615,189 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Připojuji se..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Připojuji se..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Připojuji se..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Jméno: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Připojuji se..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Popis: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Jméno:"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Popis: %s"
+
#~ msgid "Remember Username"
#~ msgstr "Zapamatovat uživatelské jméno"
diff --git a/po/da.po b/po/da.po
index d3ffa234..87afa59d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-28 14:45+0000\n"
"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Afslut"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Beskrivelse: %s"
@@ -53,12 +52,12 @@ msgstr "Stop"
msgid "Sell"
msgstr "Sælg"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Fortryd"
@@ -70,13 +69,12 @@ msgstr "Er du sikker på at du vil slette denne figur?"
msgid "Are you sure you want to delete this character?"
msgstr "Er du sikker på at du vil slette denne figur?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Vælg Bruger"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Navn; %s"
@@ -86,69 +84,68 @@ msgstr "Navn; %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Niveau: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Niveau: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Penge: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Forrige"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Næste"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Opret"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Slet"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "O.k."
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Lav figur."
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Navn:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Hårfarve:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Frisure:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Opret"
@@ -543,12 +540,7 @@ msgstr "Nej"
msgid "Connecting..."
msgstr "Opretter forbindelse..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Brug"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventarliste"
@@ -584,49 +576,24 @@ msgstr "Inventarliste"
msgid "Drop"
msgstr "Smid"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beskrivelse: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Navn:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beskrivelse: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Tag af"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Tag på"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Genvej"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Opsætning"
@@ -808,7 +775,7 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
msgid "Passwords do not match."
msgstr "Adgangskoder stemmer ikke overens."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Fejl"
@@ -816,20 +783,20 @@ msgstr "Fejl"
msgid "Sound"
msgstr "Lyd"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Lydstyrke på effekter"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Lydstyrke på musik"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Anvend"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Nulstil vinduer"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Hårfarve:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Tryk på knappen for at starte justeringen."
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Justering"
@@ -875,28 +842,28 @@ msgstr "Justering"
msgid "Enable joystick"
msgstr "Aktiver joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Stop"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Roter joystick"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Slet"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "FPS grænse:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Gennemsigtighed"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Følsomhed på mus"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Acceleration på mus"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Omgivende FX"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "fra"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "lav"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "høj"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Fuld Skærm"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Skifter til fuld skærm"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Skrifter til OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Tilføj"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Tilføj"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Du får %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Du giver:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Opretter forbindelse..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Opretter forbindelse..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Opretter forbindelse..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Navn; %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Opretter forbindelse..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beskrivelse: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Navn:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beskrivelse: %s"
+
#~ msgid "Remember Username"
#~ msgstr "Husk dette brugernavn."
diff --git a/po/de.po b/po/de.po
index e8a39a98..ed92c46d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-10-13 00:25+0000\n"
"Last-Translator: Aeneas Jaißle <Unknown>\n"
"Language-Team: German\n"
@@ -33,7 +33,6 @@ msgstr "Beenden"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Beschreibung: %s"
@@ -53,12 +52,12 @@ msgstr "Stopp"
msgid "Sell"
msgstr "Verkaufen"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Abbrechen"
@@ -70,13 +69,12 @@ msgstr "Bestätige Charakter-Löschung"
msgid "Are you sure you want to delete this character?"
msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Spielfigur auswählen"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Name : %s"
@@ -86,69 +84,68 @@ msgstr "Name : %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Stufe: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Stufe: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Geld: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Zurück"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Weiter"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Neu"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Löschen"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Charakter erstellen"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Name :"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Haarfarbe"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Frisur"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Erstellen"
@@ -543,12 +540,7 @@ msgstr "Nein"
msgid "Connecting..."
msgstr "Verbinde..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Benutzen"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventar"
@@ -584,49 +576,24 @@ msgstr "Inventar"
msgid "Drop"
msgstr "Wegwerfen"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beschreibung: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Name :"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beschreibung: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Ablegen"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Ausrüsten"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Tastenkürzel"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Einstellungen"
@@ -808,7 +775,7 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Fehler"
@@ -816,20 +783,20 @@ msgstr "Fehler"
msgid "Sound"
msgstr "Ton"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Lautstärke der Klangeffekte"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Latustärke der Musik"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Anwenden"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Fenster zurücksetzen"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Haarfarbe"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Knopf drücken um die Kalibrierung zu starten"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibrieren"
@@ -875,28 +842,28 @@ msgstr "Kalibrieren"
msgid "Enable joystick"
msgstr "Joystick aktivieren"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Stopp"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Kreise den Steuerknüppel"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Löschen"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,107 +948,107 @@ msgstr ""
msgid "FPS Limit:"
msgstr "FPS-Limit:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "GUI Transparenz"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Scroll-Radius"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Scroll-Trägheit"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Hintergrundeffekte"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "Aus"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "Niedrig"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "Hoch"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Vollbild"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Wechsle zum Vollbildmodus"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Ändere OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
"übernommen."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
@@ -1210,24 +1177,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Du erhälst %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Du gibst:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1513,6 +1484,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1639,177 +1627,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Verbinde..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Verbinde..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Verbinde..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Name : %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Verbinde..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beschreibung: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Name :"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beschreibung: %s"
+
#~ msgid "Remember Username"
#~ msgstr "Benutzernamen merken"
diff --git a/po/en_GB.po b/po/en_GB.po
index 93256370..b6713923 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\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"
@@ -33,7 +33,6 @@ msgstr "Exit"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Description: %s"
@@ -53,12 +52,12 @@ msgstr "Stop"
msgid "Sell"
msgstr "Sell"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancel"
@@ -70,13 +69,12 @@ msgstr ""
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:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Select Character"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Name: %s"
@@ -86,69 +84,68 @@ msgstr "Name: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Level: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Money: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Previous"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Next"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "New"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Delete"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Create Character"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Name:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Hair Colour:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Hair Style:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Create"
@@ -543,12 +540,7 @@ msgstr "No"
msgid "Connecting..."
msgstr "Connecting..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Use"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventory"
@@ -584,49 +576,24 @@ msgstr "Inventory"
msgid "Drop"
msgstr "Drop"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Description: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effect: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Name:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effect: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Description: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Unequip"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Equip"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Shortcut"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Setup"
@@ -808,7 +775,7 @@ msgstr "The password needs to be less than %d characters long."
msgid "Passwords do not match."
msgstr "Passwords do not match."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Error"
@@ -816,20 +783,20 @@ msgstr "Error"
msgid "Sound"
msgstr "Sound"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Sfx volume"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Music volume"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Apply"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Reset Windows"
@@ -861,11 +828,11 @@ msgstr ""
msgid "Color:"
msgstr "Colour:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Press the button to start calibration"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibrate"
@@ -873,28 +840,28 @@ msgstr "Calibrate"
msgid "Enable joystick"
msgstr "Enable joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Stop"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Rotate the stick"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Delete"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -939,7 +906,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -979,105 +946,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "FPS Limit:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Gui opacity"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Scroll radius"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Scroll laziness"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Ambient FX"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "off"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "low"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "high"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Full screen"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Switching to full screen"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Restart needed for changes to take effect."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Changing OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Applying change to OpenGL requires restart."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Restart needed for changes to take effect."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Restart needed for changes to take effect."
@@ -1206,24 +1173,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Add"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "You get %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "You give:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1509,6 +1480,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1635,177 +1623,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Connecting..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Connecting..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Connecting..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Name: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Connecting..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Description: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Name:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Description: %s"
+
#~ msgid "Unregister"
#~ msgstr "Unregister"
diff --git a/po/eo.po b/po/eo.po
index d7d627c8..eb490c33 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-11-10 22:03+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -33,7 +33,6 @@ msgstr ""
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr ""
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr ""
@@ -69,13 +68,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr ""
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr ""
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr ""
@@ -85,69 +83,68 @@ msgstr ""
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, c-format
msgid "Job Level: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr ""
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr ""
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr ""
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr ""
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr ""
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr ""
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr ""
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr ""
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr ""
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr ""
@@ -537,12 +534,7 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -552,7 +544,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr ""
@@ -569,8 +561,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr ""
@@ -578,44 +570,24 @@ msgstr ""
msgid "Drop"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-msgid "Description:"
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-msgid "Name: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-msgid "Description: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr ""
@@ -667,7 +639,7 @@ msgid "Shortcut"
msgstr ""
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr ""
@@ -793,7 +765,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr ""
@@ -801,20 +773,20 @@ msgstr ""
msgid "Sound"
msgstr ""
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -846,11 +818,11 @@ msgstr ""
msgid "Color:"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr ""
@@ -858,27 +830,27 @@ msgstr ""
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
msgid "Default"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -922,7 +894,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -962,103 +934,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1175,24 +1147,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1476,6 +1452,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1601,169 +1594,169 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
msgid "Trying to connect to account server..."
msgstr ""
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
msgid "Trying to connect to char server..."
msgstr ""
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
msgid "Trying to connect to map server..."
msgstr ""
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, c-format
msgid "Map: %s"
msgstr ""
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
msgid "Connecting to map server..."
msgstr ""
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
diff --git a/po/es.po b/po/es.po
index 6e88cb57..217e924a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-10-15 01:37+0000\n"
"Last-Translator: catalania <Unknown>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Salir"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Descripción: %s"
@@ -53,12 +52,12 @@ msgstr "Detener"
msgid "Sell"
msgstr "Vender"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancelar"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "¿Seguro que quieres borrar este personaje?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Seleccionar personaje"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nombre: %s"
@@ -86,69 +84,68 @@ msgstr "Nombre: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Nivel: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nivel: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Dinero: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Anterior"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Siguiente"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nuevo"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Eliminar"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Aceptar"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Crear Personaje"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nombre:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Color de pelo:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "corte de pelo"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Crear"
@@ -543,12 +540,7 @@ msgstr "No"
msgid "Connecting..."
msgstr "Conectando…"
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Usar"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventario"
@@ -584,49 +576,24 @@ msgstr "Inventario"
msgid "Drop"
msgstr "tirar"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descripción: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efecto: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nombre:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efecto: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descripción: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "quitarselo"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Equipar"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Atajos"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Configuración"
@@ -808,7 +775,7 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Error"
@@ -816,20 +783,20 @@ msgstr "Error"
msgid "Sound"
msgstr "Sonido"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volumen efectos"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Volumen musica"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Aplicar"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Reiniciar ventanas"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Color de pelo:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Presione el botón para comenzar la calibración"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibrar"
@@ -875,28 +842,28 @@ msgstr "Calibrar"
msgid "Enable joystick"
msgstr "Activar joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Detener"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Gire el stick"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Eliminar"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Límite de FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Transparencia menus"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Ratio de scroll"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Velocidad de scroll"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Efectos ambientales"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "desactivado"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "bajo"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "alto"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Pantalla completa"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Cambiar a pantalla completa"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Se necesita reiniciar para aplicar los cambios."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Cambiar a OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Se necesita reiniciar para aplicar los cambios."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Se necesita reiniciar para aplicar los cambios."
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Añadir"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Añadir"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Tu consigues %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Tu das:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Conectando…"
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Conectando…"
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Conectando…"
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nombre: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Conectando…"
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descripción: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efecto: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nombre:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efecto: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descripción: %s"
+
#~ msgid "Unregister"
#~ msgstr "Cancelar Cuenta"
diff --git a/po/fi.po b/po/fi.po
index 472fbd83..1bd73914 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-30 10:23+0000\n"
"Last-Translator: ville-v <villev90@gmail.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Sulje"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Kuvaus: %s"
@@ -53,12 +52,12 @@ msgstr "Lopeta"
msgid "Sell"
msgstr "Myy"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Peru"
@@ -70,14 +69,13 @@ msgstr "Vahvista hahmon poistopyyntö"
msgid "Are you sure you want to delete this character?"
msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
#, fuzzy
msgid "Select Character"
msgstr "Luo hahmo"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nimi: %s"
@@ -87,69 +85,68 @@ msgstr "Nimi: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Taso: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Taso: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Rahatilanne: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Edellinen"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Seuraava"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Uusi"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Poista"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Luo hahmo"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nimi:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Hiusten väri:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Hiustyyli:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Luo"
@@ -544,12 +541,7 @@ msgstr "Ei"
msgid "Connecting..."
msgstr "Yhdistetään..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -559,7 +551,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Käytä"
@@ -576,8 +568,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Tavaraluettelo"
@@ -585,49 +577,24 @@ msgstr "Tavaraluettelo"
msgid "Drop"
msgstr "Pudota"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Kuvaus: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Vaikutus: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nimi:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Vaikutus: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Kuvaus: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Poista varuste käytöstä"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Ota käyttöön"
@@ -679,7 +646,7 @@ msgid "Shortcut"
msgstr "Pikavalinnat"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Asetukset"
@@ -809,7 +776,7 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Virhe"
@@ -817,20 +784,20 @@ msgstr "Virhe"
msgid "Sound"
msgstr "Ääni"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Äänitehosteiden voimakkuus"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Musiikin voimakkuus"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Käytä"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Palauta ikkunoiden oletusasetukset"
@@ -864,11 +831,11 @@ msgstr ""
msgid "Color:"
msgstr "Hiusten väri:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibroi"
@@ -876,28 +843,28 @@ msgstr "Kalibroi"
msgid "Enable joystick"
msgstr "Peliohjaintuki päälle"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Lopeta"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Poista"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -942,7 +909,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -982,105 +949,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Käyttöliittymän läpinäkyvyys"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Kameran perässälaahaus"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Kameran perässälaahauksen tiukkuus"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Taustaäänet"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "pois päältä"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "matala"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "korkea"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Kokoruututila"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Kokoruututilaan siirtyminen"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Vaihdetaan OpenGL -toimintatilaan"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
@@ -1209,24 +1176,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Lisää"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Lisää"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Sait %d GP"
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Annat:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1512,6 +1483,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1638,177 +1626,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Yhdistetään..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Yhdistetään..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Yhdistetään..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nimi: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Yhdistetään..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Kuvaus: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Vaikutus: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nimi:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Vaikutus: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Kuvaus: %s"
+
#~ msgid "Remember Username"
#~ msgstr "Muista käyttäjätunnus"
diff --git a/po/fr.po b/po/fr.po
index 7f522152..9201ff5c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-26 10:43+0000\n"
"Last-Translator: Johan Serre <Unknown>\n"
"Language-Team: French\n"
@@ -34,7 +34,6 @@ msgstr "Quitter"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Description : %s"
@@ -54,12 +53,12 @@ msgstr "Stop"
msgid "Sell"
msgstr "Vendre"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Annuler"
@@ -71,13 +70,12 @@ msgstr "Confirmer la suppression du personnage"
msgid "Are you sure you want to delete this character?"
msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Choix du personnage"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nom : %s"
@@ -87,69 +85,68 @@ msgstr "Nom : %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Niveau : %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Niveau : %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Argent : %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Précédent"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Suivant"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nouveau"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Supprimer"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Création du personnage"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nom :"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Couleur des cheveux"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Coiffure :"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Créer"
@@ -544,12 +541,7 @@ msgstr "Non"
msgid "Connecting..."
msgstr "Connexion..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -559,7 +551,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Utiliser"
@@ -576,8 +568,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventaire"
@@ -585,49 +577,24 @@ msgstr "Inventaire"
msgid "Drop"
msgstr "Lâcher"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Description : %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effet : %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nom :"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effet : %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Description : %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Retirer"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Équiper"
@@ -679,7 +646,7 @@ msgid "Shortcut"
msgstr "Raccourci"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Configuration"
@@ -809,7 +776,7 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
msgid "Passwords do not match."
msgstr "Les deux mots de passe ne correspondent pas."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Erreur"
@@ -817,20 +784,20 @@ msgstr "Erreur"
msgid "Sound"
msgstr "Son"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volume des effets sonores"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Volume de la musique"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Appliquer"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Rétablir les fenêtres"
@@ -864,11 +831,11 @@ msgstr ""
msgid "Color:"
msgstr "Couleur des cheveux"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Presser le bouton pour démarrer la calibration"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibrer"
@@ -876,28 +843,28 @@ msgstr "Calibrer"
msgid "Enable joystick"
msgstr "Activer le joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Stop"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Tourner le joystick"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Supprimer"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -942,7 +909,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -982,108 +949,108 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Limite FPS :"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Opacité de l'interface"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Rayon du scrolling"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Paresse du scrolling"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Effets ambiants"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "aucun"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "léger"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "complet"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Plein écran"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Passage en plein écran"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Changement OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr ""
"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1213,24 +1180,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Ajouter"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Vous obtenez %d PO."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Vous donnez :"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1516,6 +1487,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1642,177 +1630,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Connexion..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Connexion..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Connexion..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nom : %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Connexion..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Description : %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effet : %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nom :"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effet : %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Description : %s"
+
#~ msgid "Remember Username"
#~ msgstr "Se souvenir du nom d'utilisateur"
diff --git a/po/he.po b/po/he.po
index a098c887..2d77d9f1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-10-20 00:23+0000\n"
"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
"Language-Team: Hebrew <he@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "יציאה"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "תיאור: %s"
@@ -53,12 +52,12 @@ msgstr "עצור"
msgid "Sell"
msgstr "מכר"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "ביטול"
@@ -70,14 +69,13 @@ msgstr "אשר מחיקת שחקן"
msgid "Are you sure you want to delete this character?"
msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
#, fuzzy
msgid "Select Character"
msgstr "צור שחקן"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "שם: %s"
@@ -87,69 +85,68 @@ msgstr "שם: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "רמה: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "רמה: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "זהב: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "הקודם"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "הבא"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "חדש"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "מחק"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "אישור"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "צור שחקן"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "שם:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "צבע שיער:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "תיספורת:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "צור"
@@ -544,12 +541,7 @@ msgstr "לא"
msgid "Connecting..."
msgstr "מתחבר..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -559,7 +551,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "השתמש"
@@ -576,8 +568,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "ציוד"
@@ -585,49 +577,24 @@ msgstr "ציוד"
msgid "Drop"
msgstr "השלך"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "תיאור: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "השפעה: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "שם:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "השפעה: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "תיאור: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "הורד"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "החזק"
@@ -679,7 +646,7 @@ msgid "Shortcut"
msgstr "קיצור-דרך"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "הגדרות"
@@ -809,7 +776,7 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
msgid "Passwords do not match."
msgstr "הסיסמאות אינן תואמות."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "שגיאה"
@@ -817,20 +784,20 @@ msgstr "שגיאה"
msgid "Sound"
msgstr "צליל"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "עוצמת SFX"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "עוצמת מוזיקה"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "אשר"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "אתחל חלונות"
@@ -864,11 +831,11 @@ msgstr ""
msgid "Color:"
msgstr "צבע שיער:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "כייל"
@@ -876,28 +843,28 @@ msgstr "כייל"
msgid "Enable joystick"
msgstr "אפשר ג'ויסטיק"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "עצור"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "סובב את המקל"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "מחק"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -942,7 +909,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -982,105 +949,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "הגבלת FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "אטימות Gui"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "תווך גלילה"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "עצלנות גלילה"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "אופף FX"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "כבוי"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "נמוך"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "גבוה"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "מסך מלא"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "מחליף למסך מלא"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "משנה OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "אישור שינויים עבור OpenGL דורש איתחול."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
@@ -1209,24 +1176,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "הוסף"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "הוסף"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "אתה מקבל %d זהב."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "אתה נותן:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1512,6 +1483,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1638,177 +1626,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "מתחבר..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "מתחבר..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "מתחבר..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "שם: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "מתחבר..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "תיאור: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "השפעה: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "שם:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "השפעה: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "תיאור: %s"
+
#~ msgid "Remember Username"
#~ msgstr "זכור שם משתמש"
diff --git a/po/hr.po b/po/hr.po
index 10e68177..3eba733c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-28 23:36+0000\n"
"Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
"Language-Team: Croatian <hr@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Izlaz"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Opis: %s"
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Poništi"
@@ -69,14 +68,13 @@ msgstr "Potvrdi Brisanje Lika"
msgid "Are you sure you want to delete this character?"
msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
#, fuzzy
msgid "Select Character"
msgstr "Stvori Lika"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Ime: %s"
@@ -86,69 +84,68 @@ msgstr "Ime: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Nivo: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nivo: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Novac: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Prethodni"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Slijedeći"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Novi"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Obriši"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "U redu"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Stvori Lika"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Ime:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Boja kose:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Frizura:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Stvori"
@@ -539,12 +536,7 @@ msgstr "Ne"
msgid "Connecting..."
msgstr "Spajanje..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -554,7 +546,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Upotrijebi"
@@ -571,8 +563,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Zalihe"
@@ -580,49 +572,24 @@ msgstr "Zalihe"
msgid "Drop"
msgstr "Ispusti"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Učinak: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Ime:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Učinak: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Skini opremu"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Opremi"
@@ -674,7 +641,7 @@ msgid "Shortcut"
msgstr "Kratica"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Podešavanje"
@@ -802,7 +769,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Greška"
@@ -810,20 +777,20 @@ msgstr "Greška"
msgid "Sound"
msgstr ""
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -857,11 +824,11 @@ msgstr ""
msgid "Color:"
msgstr "Boja kose:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr ""
@@ -869,28 +836,28 @@ msgstr ""
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Obriši"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -935,7 +902,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -975,103 +942,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1195,24 +1162,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1497,6 +1468,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1623,177 +1611,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Spajanje..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Spajanje..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Spajanje..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Ime: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Spajanje..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Učinak: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Ime:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Učinak: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Opis: %s"
+
#~ msgid "Remember Username"
#~ msgstr "Zapamti korisničko ime"
diff --git a/po/id.po b/po/id.po
index cf39a880..0ee3c5b4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-03-26 09:11+0000\n"
"Last-Translator: ActiveFile <activefile@gmail.com>\n"
"Language-Team: Indonesian <id@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Keluar"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Deskripsi: %s"
@@ -53,12 +52,12 @@ msgstr "Berhenti"
msgid "Sell"
msgstr "Jual"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Batal"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Pilih Karakter"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nama: %s"
@@ -86,69 +84,68 @@ msgstr "Nama: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Tingkatan: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Tingkatan: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Uang: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Sebelumnya"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Berikutnya"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Buat baru"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Hapus"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Buat Karakter"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nama:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Warna Rambut:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Gaya Rambut:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Buat"
@@ -543,12 +540,7 @@ msgstr "Tidak"
msgid "Connecting..."
msgstr "Menyambung..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Gunakan"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventaris"
@@ -584,49 +576,24 @@ msgstr "Inventaris"
msgid "Drop"
msgstr "Jatuh"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Deskripsi: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efek: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nama:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efek: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Deskripsi: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr ""
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Tombol Singkat"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Atur"
@@ -808,7 +775,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr "Kata sandi tidak sama."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Kesalahan"
@@ -816,20 +783,20 @@ msgstr "Kesalahan"
msgid "Sound"
msgstr "Suara"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volume sfx"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Volume Musik"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Terapkan"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Warna Rambut:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Tekan tombol untuk memulai kalibrasi"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibrasi"
@@ -875,28 +842,28 @@ msgstr "Kalibrasi"
msgid "Enable joystick"
msgstr "Membolehkan joistik"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Berhenti"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Memutar tongkat"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Hapus"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Batas FPS"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Radius gulungan"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "mati"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "rendah"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "tinggi"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Layar penuh"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Mengganti ke layar penuh"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Mengubah OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Tambah"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Tambah"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Anda mendapatkan %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Anda memberikan:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Menyambung..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Menyambung..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Menyambung..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nama: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Menyambung..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Deskripsi: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efek: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nama:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efek: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Deskripsi: %s"
+
#~ msgid "Unregister"
#~ msgstr "Tidak terdaftar"
diff --git a/po/it.po b/po/it.po
index 342aab49..1df6f016 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2007-12-03 01:45+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Italian\n"
@@ -35,7 +35,6 @@ msgstr "Esci"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Descrizione : %s"
@@ -55,12 +54,12 @@ msgstr "Ferma"
msgid "Sell"
msgstr "Vendi"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancella"
@@ -72,13 +71,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Sei sicuro di voler cancellare questo personaggio?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Scelta Personaggio"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nome : %s"
@@ -88,69 +86,68 @@ msgstr "Nome : %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Livello: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Livello: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Monete: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Precedente"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Prossimo"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nuovo"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Elimina"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Crea Personaggio"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nome :"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Colore Capelli"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Stile Capelli:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Create"
@@ -545,12 +542,7 @@ msgstr "No"
msgid "Connecting..."
msgstr "Connessione..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -560,7 +552,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Usa"
@@ -577,8 +569,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventario"
@@ -586,49 +578,24 @@ msgstr "Inventario"
msgid "Drop"
msgstr "Lascia"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descrizione : %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effetto : %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nome :"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effetto : %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descrizione : %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Rimuovi"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Equipaggia"
@@ -680,7 +647,7 @@ msgid "Shortcut"
msgstr "Scorciatoia"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Impostazioni"
@@ -810,7 +777,7 @@ msgstr "La password deve contenere meno di %d caratteri."
msgid "Passwords do not match."
msgstr "Le password non corrispondono."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Errore"
@@ -818,20 +785,20 @@ msgstr "Errore"
msgid "Sound"
msgstr "Suono"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volume effetti sonori"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Volume musica"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Applica"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Resetta finestre"
@@ -865,11 +832,11 @@ msgstr ""
msgid "Color:"
msgstr "Colore Capelli"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Premi il pulsante per cominciare la calibrazione"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibra"
@@ -877,28 +844,28 @@ msgstr "Calibra"
msgid "Enable joystick"
msgstr "Abilita joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Ferma"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Ruota la manopola"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Elimina"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -943,7 +910,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -983,105 +950,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Limita FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Opacità IU"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Raggio dello scroll"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Lentezza dello scroll"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Suoni ambientali"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "Spento"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "Basso"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "Alto"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Schermo intero"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Modalità a schermo intero"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Modifica OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
@@ -1210,24 +1177,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Aggiungi"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Ottieni %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Dai:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1513,6 +1484,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1639,177 +1627,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Connessione..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Connessione..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Connessione..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nome : %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Connessione..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrizione : %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effetto : %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nome :"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effetto : %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descrizione : %s"
+
#~ msgid "Unregister"
#~ msgstr "Cancella registrazione"
diff --git a/po/ja.po b/po/ja.po
index 2f0cf9f4..4e4ba8b8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-06-28 16:27+0000\n"
"Last-Translator: fate <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "終了"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "名状: %s"
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "取消"
@@ -69,13 +68,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "このキャラは消してもいいですか?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "キャラを選択"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "名前: %s"
@@ -85,69 +83,68 @@ msgstr "名前: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "レベル: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "レベル: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "GP: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "前へ"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "次へ"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "新規"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "削除"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "了解"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "キャラを作成"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "名前:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "髪の色:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "髪型:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "作成"
@@ -541,12 +538,7 @@ msgstr "いいえ"
msgid "Connecting..."
msgstr "接続しています..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -556,7 +548,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "使う"
@@ -573,8 +565,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr ""
@@ -582,49 +574,24 @@ msgstr ""
msgid "Drop"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "名状: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "効用: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "名前:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "効用: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "名状: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr ""
@@ -676,7 +643,7 @@ msgid "Shortcut"
msgstr ""
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "セットアップ"
@@ -804,7 +771,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr "パスワードが一致していません。"
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "エラー"
@@ -812,20 +779,20 @@ msgstr "エラー"
msgid "Sound"
msgstr ""
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -859,11 +826,11 @@ msgstr ""
msgid "Color:"
msgstr "髪の色:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr ""
@@ -871,28 +838,28 @@ msgstr ""
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "削除"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -937,7 +904,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -977,103 +944,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1197,24 +1164,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1499,6 +1470,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1625,177 +1613,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "接続しています..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "接続しています..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "接続しています..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "名前: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "接続しています..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "名状: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "効用: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "名前:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "効用: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "名状: %s"
+
#~ msgid "Unregister"
#~ msgstr "登録削除"
diff --git a/po/nl.po b/po/nl.po
index 2ee556d1..96247edc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-10-10 00:04+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Dutch\n"
@@ -33,7 +33,6 @@ msgstr "Afsluiten"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Beschrijving: %s"
@@ -53,12 +52,12 @@ msgstr "Stoppen"
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Annuleren"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Kies Personage"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Naam: %s"
@@ -86,69 +84,68 @@ msgstr "Naam: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Level: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Geld: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Vorige"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Volgende"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nieuw"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Verwijderen"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Oké"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Personage Aanmaken"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Naam:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Haarkleur:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Haarstijl:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Aanmaken"
@@ -543,12 +540,7 @@ msgstr "Nee"
msgid "Connecting..."
msgstr "Verbinden..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Gebruiken"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventaris"
@@ -584,49 +576,24 @@ msgstr "Inventaris"
msgid "Drop"
msgstr "Neerleggen"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beschrijving: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effect: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Naam:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effect: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beschrijving: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Afdoen"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Uitrusten"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr ""
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Configureren"
@@ -808,7 +775,7 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Fout"
@@ -816,20 +783,20 @@ msgstr "Fout"
msgid "Sound"
msgstr "Geluid"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volume van geluiden"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Muziek volume"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Toepassen"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Vensters in beginstand"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Haarkleur:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Druk op de knop om het kalibreren te starten"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibreren"
@@ -875,28 +842,28 @@ msgstr "Kalibreren"
msgid "Enable joystick"
msgstr "Joystick activeren"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Stoppen"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Maak rondjes met de stick"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Verwijderen"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "FPS limiet:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Dekking van de GUI"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Scroll radius"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Scroll vertraging"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Omgevingseffecten"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "uit"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "laag"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "hoog"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Volledig scherm"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Overgaan naar volledig scherm"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Veranderen van OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
@@ -1204,24 +1171,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Je geeft:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1507,6 +1478,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1633,177 +1621,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Verbinden..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Verbinden..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Verbinden..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Naam: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Verbinden..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beschrijving: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Naam:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beschrijving: %s"
+
#~ msgid "Unregister"
#~ msgstr "Registreren"
diff --git a/po/pl.po b/po/pl.po
index d1e98691..9c409ecb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-10-10 05:26+0000\n"
"Last-Translator: Michał Trzebiatowski <Unknown>\n"
"Language-Team: <pl@li.org>\n"
@@ -35,7 +35,6 @@ msgstr "Wyjdź"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Opis: %s"
@@ -55,12 +54,12 @@ msgstr "Zatrzymaj"
msgid "Sell"
msgstr "Sprzedaj"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Anuluj"
@@ -72,13 +71,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Wybierz postać"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Imię: %s"
@@ -88,69 +86,68 @@ msgstr "Imię: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Poziom: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Poziom: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Pieniądze: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Poprzedni"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Następny"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nowa"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Usuń"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Stwórz postać"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Imię:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Kolor włosów:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Fryzura:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Stwórz"
@@ -545,12 +542,7 @@ msgstr "Nie"
msgid "Connecting..."
msgstr "Łączenie..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -560,7 +552,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Użyj"
@@ -577,8 +569,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inwentarz"
@@ -586,49 +578,24 @@ msgstr "Inwentarz"
msgid "Drop"
msgstr "Upuść"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efekt: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Imię:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Zdejmij"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Załóż"
@@ -680,7 +647,7 @@ msgid "Shortcut"
msgstr "Skrót"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Konfiguracja"
@@ -810,7 +777,7 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
msgid "Passwords do not match."
msgstr "Hasła nie zgadzają się."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Błąd"
@@ -818,20 +785,20 @@ msgstr "Błąd"
msgid "Sound"
msgstr "Dźwięk"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Głośność efektów dźwiękowych"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Głośność muzyki"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Zastosuj"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Zresetuj okna"
@@ -865,11 +832,11 @@ msgstr ""
msgid "Color:"
msgstr "Kolor włosów:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibruj"
@@ -877,28 +844,28 @@ msgstr "Kalibruj"
msgid "Enable joystick"
msgstr "Włącz joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Zatrzymaj"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Obróć drążek"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Usuń"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -943,7 +910,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -983,106 +950,106 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Limit FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Przezroczystość GUI"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Skok przy przewijaniu ekranu"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Opóźnienie przy przewijaniu ekranu"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Dźwięki otoczenia"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "wyłączone"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "niskie"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "wysokie"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Pełen ekran"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Przełączanie na pełen ekran"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Zmień ustawienia OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
@@ -1211,24 +1178,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Dodaj"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Otrzymujesz %d GP"
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Dajesz:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1514,6 +1485,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1640,177 +1628,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Łączenie..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Łączenie..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Łączenie..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Imię: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Łączenie..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Imię:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Opis: %s"
+
#~ msgid "Unregister"
#~ msgstr "Wyrejestruj"
diff --git a/po/pt.po b/po/pt.po
index 72737624..fffa1efc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-02-03 10:14+0000\n"
"Last-Translator: Tiago Silva <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Sair"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Descrição: %s"
@@ -53,12 +52,12 @@ msgstr "Parar"
msgid "Sell"
msgstr "Vender"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancelar"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Tem a certeza que quer apagar este personagem"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Seleccione um Personagem"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nome: %s"
@@ -86,69 +84,68 @@ msgstr "Nome: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nível: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Dinheiro: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Anterior"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Seguinte"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Novo"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Eliminar"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Criar Personagem"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nome:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Cor de Cabelo:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Estilo do Cabelo:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Criar"
@@ -543,12 +540,7 @@ msgstr "Não"
msgid "Connecting..."
msgstr "Conectando..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Usar"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventário"
@@ -584,49 +576,24 @@ msgstr "Inventário"
msgid "Drop"
msgstr "Largar"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efeito: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nome:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efeito: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Desequipar"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Equipar"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Atalho"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Configuração"
@@ -808,7 +775,7 @@ msgstr "A password só pode ter até %d caracteres."
msgid "Passwords do not match."
msgstr "As senhas não coincidem."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Erro"
@@ -816,20 +783,20 @@ msgstr "Erro"
msgid "Sound"
msgstr "Som"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volume dos Efeitos"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Volume da Música"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Aplicar"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Reiniciar Janelas"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Cor de Cabelo:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Pressione o botão para começar a calibragem"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibrar"
@@ -875,28 +842,28 @@ msgstr "Calibrar"
msgid "Enable joystick"
msgstr "Habilitar Joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Parar"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Rode o manipulo"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Eliminar"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Limite de FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Opacidade do Interface"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Efeitos Ambientais"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "desligado"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "baixo"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "elevado"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Ecrã completo"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Mudar para ecrã completo"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "É necessário reiniciar para as alterações terem efeito."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Mudando OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "É necessário reiniciar para as alterações terem efeito."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "É necessário reiniciar para as alterações terem efeito."
@@ -1216,24 +1183,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Adicionar"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Adicionar"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Recebe %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Dá:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1519,6 +1490,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1645,177 +1633,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Conectando..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Conectando..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Conectando..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nome: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Conectando..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descrição: %s"
+
#~ msgid "Unregister"
#~ msgstr "Remover o Registo"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 58ec5d1b..c8550606 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-14 21:37+0000\n"
"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Sair"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Descrição: %s"
@@ -53,12 +52,12 @@ msgstr "Parar"
msgid "Sell"
msgstr "Vender"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancelar"
@@ -70,13 +69,12 @@ msgstr "Confimar exclusão do personagem"
msgid "Are you sure you want to delete this character?"
msgstr "Tem certeza de que deseja excluir este personagem?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Selecionar personagem"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Nome: %s"
@@ -86,69 +84,68 @@ msgstr "Nome: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nível: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Dinheiro: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Anterior"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Próximo"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Novo"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Excluir"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Criar Personagem"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nome:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Cor do Cabelo:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Estilo do Cabelo:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Criar"
@@ -543,12 +540,7 @@ msgstr "Não"
msgid "Connecting..."
msgstr "Conectando..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Usar"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventório"
@@ -584,49 +576,24 @@ msgstr "Inventório"
msgid "Drop"
msgstr "Descartar"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efeito: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nome:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efeito: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Desequipar"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Equipar"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Atalho"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Configurar"
@@ -808,7 +775,7 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Erro"
@@ -816,20 +783,20 @@ msgstr "Erro"
msgid "Sound"
msgstr "Som"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volume Sfx"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Volume da Música"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Aplicar"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Restaurar janelas"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Cor do Cabelo:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Aperto o botão para começar a calibração"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibrar"
@@ -875,28 +842,28 @@ msgstr "Calibrar"
msgid "Enable joystick"
msgstr "Habilitar joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Parar"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Excluir"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Limite FPS:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Opacidade da GUI"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Ambiente FX"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "desligado"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "baixo"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "alto"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Tela cheia"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Mudando para Tela cheia"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Trocando OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Adicionar"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Adicionar"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Voc pegou %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Você dá:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Conectando..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Conectando..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Conectando..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Nome: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Conectando..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descrição: %s"
+
#~ msgid "Remember Username"
#~ msgstr "Lembrar nome de usuário"
diff --git a/po/ru.po b/po/ru.po
index 6d1d3a98..f1dc2710 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-01-08 11:50+0000\n"
"Last-Translator: idle sign <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Выход"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Описание: %s"
@@ -53,12 +52,12 @@ msgstr "Стоп"
msgid "Sell"
msgstr "Продать"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Отмена"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Вы уверены, что хотите удалить этого персонажа?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Выбор персонажа"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Имя: %s"
@@ -86,69 +84,68 @@ msgstr "Имя: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Уровень: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Уровень: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Деньги: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Предыдущий"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Следующий"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Новый"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Удалить"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Создать персонажа"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Имя:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Цвет волос:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Стрижка:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Создать"
@@ -543,12 +540,7 @@ msgstr "Нет"
msgid "Connecting..."
msgstr "Соединение..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Использовать"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Инвентарь"
@@ -584,49 +576,24 @@ msgstr "Инвентарь"
msgid "Drop"
msgstr "Сбросить"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Описание: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Эффект: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Имя:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Эффект: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Описание: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Снять"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Надеть"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Клавиша"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Настройка"
@@ -808,7 +775,7 @@ msgstr "Пароль не должен содержать более %d симв
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Ошибка"
@@ -816,20 +783,20 @@ msgstr "Ошибка"
msgid "Sound"
msgstr "Звук"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Громкость эффектов"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Громкость музыки"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Применить"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Восстановить расположение окон"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Цвет волос:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Нажмите кнопку, чтобы начать калибровку"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Калибровать"
@@ -875,28 +842,28 @@ msgstr "Калибровать"
msgid "Enable joystick"
msgstr "Использовать джойстик"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Стоп"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Вращайте рукоять"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Удалить"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "Ограничение кадр/с:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Прозрачность интерфейса"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Радиус прокрутки"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Заторможенность прокрутки"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Эффекты окружающей среды"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "выкл"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "низ."
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "выс."
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "На полный экран"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Переключение в полноэкранный режим"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Переключение на OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Переход к OpenGL требует перезагрузки игры."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Добавить"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Добавить"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Вы получили %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Вы отдаете:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Соединение..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Соединение..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Соединение..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Имя: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Соединение..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Описание: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Эффект: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Имя:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Эффект: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Описание: %s"
+
#~ msgid "Unregister"
#~ msgstr "Удалить регистрацию"
diff --git a/po/sk.po b/po/sk.po
index 8b0eec38..3c98e8d8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-12-30 14:07+0000\n"
"Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Ukončiť"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Popis: %s"
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Zrušiť"
@@ -69,14 +68,13 @@ msgstr "Potvrdte zmazanie postavy"
msgid "Are you sure you want to delete this character?"
msgstr "Naozaj chcete odstrániť túto postavu?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
#, fuzzy
msgid "Select Character"
msgstr "Vytvoriť postavu"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr ""
@@ -86,69 +84,68 @@ msgstr ""
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Level: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Peniaze: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Predchádzajúci"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Nasledujúci"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Nový"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Vymazať"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ano"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Vytvoriť postavu"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Meno"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Farba vlasov:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Štýl vlasov:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Vytvoriť"
@@ -539,12 +536,7 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -554,7 +546,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr ""
@@ -571,8 +563,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr ""
@@ -580,49 +572,24 @@ msgstr ""
msgid "Drop"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Meno"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr ""
@@ -674,7 +641,7 @@ msgid "Shortcut"
msgstr ""
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr ""
@@ -800,7 +767,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr ""
@@ -808,20 +775,20 @@ msgstr ""
msgid "Sound"
msgstr ""
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -855,11 +822,11 @@ msgstr ""
msgid "Color:"
msgstr "Farba vlasov:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr ""
@@ -867,28 +834,28 @@ msgstr ""
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Vymazať"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -933,7 +900,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -973,103 +940,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1188,24 +1155,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1490,6 +1461,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1616,173 +1604,193 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
msgid "Trying to connect to account server..."
msgstr ""
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
msgid "Trying to connect to char server..."
msgstr ""
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
msgid "Trying to connect to map server..."
msgstr ""
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, c-format
msgid "Map: %s"
msgstr ""
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
msgid "Connecting to map server..."
msgstr ""
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Popis: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Meno"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Popis: %s"
+
#~ msgid "Account and Character Management"
#~ msgstr "Účet a správa postáv"
diff --git a/po/sv.po b/po/sv.po
index 88148c62..85e7588d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-05-07 19:04+0000\n"
"Last-Translator: Kess Vargavind <Unknown>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Avsluta"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "Beskrivning: %s"
@@ -53,12 +52,12 @@ msgstr "Stopp"
msgid "Sell"
msgstr "Sälj"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Avbryt"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "Är du säker på att du vill ta bort den här karaktären?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "Välj karaktär"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "Namn: %s"
@@ -86,69 +84,68 @@ msgstr "Namn: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "Nivå: %d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nivå: %d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "Pengar: %d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "Föregående"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "Nästa"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "Ny"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "Ta bort"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "Ok"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "Skapa karaktär"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Namn:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "Hårfärg:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "Frisyr:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "Skapa"
@@ -543,12 +540,7 @@ msgstr "Nej"
msgid "Connecting..."
msgstr "Ansluter..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "Använd"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "Inventarium"
@@ -584,49 +576,24 @@ msgstr "Inventarium"
msgid "Drop"
msgstr "Släpp"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beskrivning: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Namn:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beskrivning: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "Avrusta"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "Utrusta"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "Genväg"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "Inställningar"
@@ -808,7 +775,7 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
msgid "Passwords do not match."
msgstr "Lösenorden stämmer inte överens."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "Fel"
@@ -816,20 +783,20 @@ msgstr "Fel"
msgid "Sound"
msgstr "Ljud"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "Volym för ljudeffekter"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "Musikvolym"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "Verkställ"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "Återställ fönster"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "Hårfärg:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Klicka på knappen för att starta kalibreringen"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibrera"
@@ -875,28 +842,28 @@ msgstr "Kalibrera"
msgid "Enable joystick"
msgstr "Aktivera joystick"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "Stopp"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "Rotera spaken"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "Ta bort"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "FPS-gräns:"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Genomskinlighet"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "Rullningsradie"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "Tröghet för rullning"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "Omgivande FX"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "av"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "låg"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "hög"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "Helskärm"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "Byte till helskärm"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "Ändrar OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "Ändringar i OpenGL kräver omstart."
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Lägg till"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "Du får %d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "Du ger:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "Ansluter..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "Ansluter..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "Ansluter..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "Namn: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "Ansluter..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beskrivning: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Namn:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beskrivning: %s"
+
#~ msgid "Unregister"
#~ msgstr "Avregistrera"
diff --git a/po/th.po b/po/th.po
index 70a4bc2c..cc7f58df 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-11-25 06:16+0000\n"
"Last-Translator: Tharawut Paripaiboon <Unknown>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "ออก"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr ""
@@ -52,12 +51,12 @@ msgstr ""
msgid "Sell"
msgstr ""
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "ยกเลิก"
@@ -69,14 +68,13 @@ msgstr "ยืนยันการลบตัวละคร"
msgid "Are you sure you want to delete this character?"
msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
#, fuzzy
msgid "Select Character"
msgstr "สร้างตัวละคร"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "ชื่อ: %s"
@@ -86,69 +84,68 @@ msgstr "ชื่อ: %s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, c-format
msgid "Job Level: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "ก่อนหน้า"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "ถัดไป"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "สร้างใหม่"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "ลบทิ้ง"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "ตกลง"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "สร้างตัวละคร"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "ชื่อ:"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "สีผม:"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "ทรงผม:"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "สร้าง"
@@ -539,12 +536,7 @@ msgstr "ไม่"
msgid "Connecting..."
msgstr "กำลังเชื่อมต่อ..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -554,7 +546,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "ใช้"
@@ -571,8 +563,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr ""
@@ -580,45 +572,24 @@ msgstr ""
msgid "Drop"
msgstr "ทิ้ง"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-msgid "Description:"
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "ชื่อ:"
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-msgid "Description: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr ""
@@ -670,7 +641,7 @@ msgid "Shortcut"
msgstr ""
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "ตั้งค่า"
@@ -796,7 +767,7 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "ผิดพลาด"
@@ -804,20 +775,20 @@ msgstr "ผิดพลาด"
msgid "Sound"
msgstr ""
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr ""
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr ""
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr ""
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr ""
@@ -851,11 +822,11 @@ msgstr ""
msgid "Color:"
msgstr "สีผม:"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr ""
@@ -863,28 +834,28 @@ msgstr ""
msgid "Enable joystick"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr ""
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "ลบทิ้ง"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -929,7 +900,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -969,103 +940,103 @@ msgstr ""
msgid "FPS Limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr ""
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr ""
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr ""
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "fullscreen"
msgstr ""
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr ""
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
msgid "Restart your client or change maps for the change to take effect."
msgstr ""
@@ -1189,24 +1160,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr ""
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr ""
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1491,6 +1466,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1617,177 +1609,181 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "กำลังเชื่อมต่อ..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "กำลังเชื่อมต่อ..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "กำลังเชื่อมต่อ..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "ชื่อ: %s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "กำลังเชื่อมต่อ..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "ชื่อ:"
+
#~ msgid "Change Password"
#~ msgstr "เปลี่ยนรหัสผ่าน"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c69f2cf8..2cc1d038 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
"PO-Revision-Date: 2008-09-17 14:41+0000\n"
"Last-Translator: luojie-dune <Unknown>\n"
"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "退出"
#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
#, c-format
msgid "Description: %s"
msgstr "描述:%s"
@@ -53,12 +52,12 @@ msgstr "停止"
msgid "Sell"
msgstr "出售"
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "取消"
@@ -70,13 +69,12 @@ msgstr ""
msgid "Are you sure you want to delete this character?"
msgstr "你确定想删除这个较色"
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
msgid "Select Character"
msgstr "选择较色"
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
#, c-format
msgid "Name: %s"
msgstr "名字:%s"
@@ -86,69 +84,68 @@ msgstr "名字:%s"
#. ----------------------
#. Status Part
#. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
#: ../src/gui/status.cpp:230
#, c-format
msgid "Level: %d"
msgstr "等级:%d"
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "等级:%d"
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
#, c-format
msgid "Money: %d"
msgstr "金钱:%d"
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
msgid "Previous"
msgstr "上一页"
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
msgid "Next"
msgstr "下一页"
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
msgid "New"
msgstr "新建"
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
msgid "Delete"
msgstr "删除"
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
msgid "Ok"
msgstr "OK"
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
#, c-format
msgid "Gold: %d"
msgstr ""
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
msgid "Create Character"
msgstr "创建角色"
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "名称"
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
msgid "Hair Color:"
msgstr "头发颜色"
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
msgid "Hair Style:"
msgstr "发型"
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
msgid "Create"
msgstr "建立"
@@ -543,12 +540,7 @@ msgstr "否"
msgid "Connecting..."
msgstr "连接中..."
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
msgid "Unable to load selection.png"
msgstr ""
@@ -558,7 +550,7 @@ msgid "Emote"
msgstr ""
#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
msgid "Use"
msgstr "使用"
@@ -575,8 +567,8 @@ msgstr ""
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
msgid "Inventory"
msgstr "清单"
@@ -584,49 +576,24 @@ msgstr "清单"
msgid "Drop"
msgstr "丢弃"
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "描述:%s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "影响: %s"
-
#. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
msgid "Weight: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
msgid " g Slots: "
msgstr ""
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "名称"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "影响: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "描述:%s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
msgid "Unequip"
msgstr "卸下装备"
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
msgid "Equip"
msgstr "装备"
@@ -678,7 +645,7 @@ msgid "Shortcut"
msgstr "快捷键"
#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
msgid "Setup"
msgstr "安装"
@@ -808,7 +775,7 @@ msgstr "密码不能少于%d个字符"
msgid "Passwords do not match."
msgstr "密码不一致."
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
msgid "Error"
msgstr "错误"
@@ -816,20 +783,20 @@ msgstr "错误"
msgid "Sound"
msgstr "声音"
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
msgid "Sfx volume"
msgstr "音效声量"
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
msgid "Music volume"
msgstr "音乐声量"
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
msgid "Apply"
msgstr "应用"
#. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
msgid "Reset Windows"
msgstr "重置窗口"
@@ -863,11 +830,11 @@ msgstr ""
msgid "Color:"
msgstr "头发颜色"
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "按下开始校准按钮"
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "校准"
@@ -875,28 +842,28 @@ msgstr "校准"
msgid "Enable joystick"
msgstr "启用游戏杆"
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
msgid "Stop"
msgstr "停止"
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
msgid "Rotate the stick"
msgstr "旋转手柄"
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
#, fuzzy
msgid "Default"
msgstr "删除"
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
msgid "Key Conflict(s) Detected."
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
@@ -941,7 +908,7 @@ msgstr ""
msgid "Allow whispers"
msgstr ""
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
msgid "When ignoring:"
msgstr ""
@@ -981,105 +948,105 @@ msgstr ""
msgid "FPS Limit:"
msgstr "FPS限制"
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
msgid "Gui opacity"
msgstr "Gui 透明度"
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
msgid "Scroll radius"
msgstr "滚动半径"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
msgid "Scroll laziness"
msgstr "拉动极限"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
msgid "Ambient FX"
msgstr "环境音效"
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
msgid "off"
msgstr "离线"
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
msgid "low"
msgstr "低"
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
msgid "high"
msgstr "高"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
msgid "Particle Detail"
msgstr ""
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
msgid "Failed to switch to "
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
msgid "windowed"
msgstr ""
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
#, fuzzy
msgid "fullscreen"
msgstr "全屏"
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
msgid "Switching to full screen"
msgstr "切换到全屏"
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
msgid "Restart needed for changes to take effect."
msgstr "只有改变生效后才能重启"
#. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
msgid "Changing OpenGL"
msgstr "改变成OpenGL"
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
msgid "Applying change to OpenGL requires restart."
msgstr "运用改变为OpenGL需要重新开始"
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
msgid "Couldn't set "
msgstr ""
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
msgid " video mode: "
msgstr ""
#. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
msgid "Screen resolution changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "只有改变生效后才能重启"
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
msgid "Particle effect settings changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
#, fuzzy
msgid "Restart your client or change maps for the change to take effect."
msgstr "只有改变生效后才能重启"
@@ -1208,24 +1175,28 @@ msgstr ""
msgid "Remaining Status Points: %d"
msgstr ""
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "添加"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
msgid "Trade"
msgstr ""
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "添加"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
#, c-format
msgid "You get %d GP."
msgstr "你得到%d GP."
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
msgid "You give:"
msgstr "你得到:"
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -1511,6 +1482,23 @@ msgstr ""
msgid "ColorDB: Error, unknown dye ID# %d"
msgstr ""
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:52
msgid "Initializing item database..."
msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
msgid "Warning: guichan input exception: %s"
msgstr ""
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
#, c-format
msgid "Error: Invalid update host: %s"
msgstr ""
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
msgid "Invalid update host: "
msgstr ""
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
msgid "Warning: no protocol was specified for the update host"
msgstr ""
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
#, c-format
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr ""
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
msgid "Error creating updates directory!"
msgstr ""
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
msgid " can't be created, but it doesn't exist! Exiting."
msgstr ""
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
#, c-format
msgid "Starting Aethyra Version %s"
msgstr ""
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
msgid "Starting Aethyra - Version not defined"
msgstr ""
#. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
msgid "Initializing SDL..."
msgstr ""
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
msgid "Could not initialize SDL: "
msgstr ""
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
msgid " couldn't be set as home directory! Exiting."
msgstr ""
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
#, c-format
msgid "Can't find Resources directory\n"
msgstr ""
#. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
msgid "Initializing configuration..."
msgstr ""
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
#, c-format
msgid "Warning: %s"
msgstr ""
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
msgid "aethyra"
msgstr ""
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
msgid "Options: "
msgstr ""
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
msgid " -C --configfile : Configuration file to use"
msgstr ""
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
msgid " -d --data : Directory to load game data from"
msgstr ""
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
msgid " -D --default : Bypass the login process with default settings"
msgstr ""
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
msgid " -h --help : Display this help"
msgstr ""
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
msgid " -H --updatehost : Use this update host"
msgstr ""
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
msgid " -p --playername : Login with this player"
msgstr ""
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
msgid " -P --password : Login with this password"
msgstr ""
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
msgid " -u --skipupdate : Skip the update downloads"
msgstr ""
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
msgid " -U --username : Login with this username"
msgstr ""
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
msgid " -v --version : Display the version"
msgstr ""
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
msgid "Aethyra version "
msgstr ""
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
msgid "(local build?, PACKAGE_VERSION is not defined)"
msgstr ""
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
#, fuzzy
msgid "Trying to connect to account server..."
msgstr "连接中..."
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
#, c-format
msgid "Username is %s"
msgstr ""
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
#, fuzzy
msgid "Trying to connect to char server..."
msgstr "连接中..."
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
#, c-format
msgid "Memorizing selected character %s"
msgstr ""
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
#, fuzzy
msgid "Trying to connect to map server..."
msgstr "连接中..."
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
#, fuzzy, c-format
msgid "Map: %s"
msgstr "名字:%s"
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
#, c-format
msgid "Couldn't load %s as wallpaper"
msgstr ""
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
msgid "Got disconnected from server!"
msgstr ""
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
#, fuzzy
msgid "Connecting to map server..."
msgstr "连接中..."
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
msgid "Connecting to character server..."
msgstr ""
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
msgid "Connecting to account server..."
msgstr ""
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "描述:%s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "影响: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "名称"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "影响: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "描述:%s"
+
#~ msgid "Unregister"
#~ msgstr "注销"