Update and rebuild translations.

author: Andrei Karas <akaras@inbox.ru> 2011-08-16 19:20:39 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-08-16 19:20:39 +0300
commit: 35cf98e57d4dc37ec421288cbe1840ca8fcc3547 (patch)
tree: 719c048de6b74b422840c7ef629cf4640f0ee714
parent: 92311f100efe888df9f8101d22ba9f2d7b483074 (diff)
download: manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.tar.gz
manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.tar.bz2
manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.tar.xz
manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.zip
14 files changed, 1045 insertions, 972 deletions
diff --git a/po/de.po b/po/de.po
index 0252b06f5..310a34f6e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -109,7 +109,7 @@ msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -436,7 +436,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Geschäft"
 
@@ -705,7 +705,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -741,7 +741,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Karte"
 
@@ -1223,7 +1223,7 @@ msgid "Submit"
 msgstr "Absenden"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1881,10 +1881,6 @@ msgstr "Anwenden"
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -1929,163 +1925,163 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Protokoliere NPC Gespräche"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2225,67 +2221,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
@@ -3563,6 +3563,10 @@ msgstr "Globale Ansage von %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Anderen Spieler ignorieren"
diff --git a/po/es.po b/po/es.po
index 2e1f15442..b09b35c8c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
@@ -111,7 +111,7 @@ msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
@@ -437,7 +437,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Tienda"
 
@@ -706,7 +706,7 @@ msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -742,7 +742,7 @@ msgid "Ignore"
 msgstr "Ignorar"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -1224,7 +1224,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1882,10 +1882,6 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
@@ -1930,163 +1926,163 @@ msgstr "Por defecto"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Misceláneos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstruos"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Resaltar el alcanze de ataque de los monstruos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de energía del monstruo"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Apuntar a los monstruos en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar las partículas de efectos"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Resaltar los objetos sobre el suelo"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Resaltar el alcance de ataque del jugador"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minmapas extendidos"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Dibujar trayectoria"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Dibujar teclas de acceso rápido en el mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "En movimiento"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Corrección automatica de la posición"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronización de movimiento de jugador"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar barra de energía propia"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensaje afk"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra / venta"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Registro de diálogo de NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Otro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar los ataques colaterales de servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar el control de robot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar la proteción contra servidores defectuosos"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar los objetos escudos"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -2226,67 +2222,71 @@ msgstr "Relaciones"
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Extenso (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema de interfáz gráfica"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
@@ -3561,6 +3561,10 @@ msgstr "Anuncio global de  %s:"
 msgid "%s whispers: %s"
 msgstr "%s envía mensaje privado: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora al jugador"
diff --git a/po/fi.po b/po/fi.po
index 5b5b5388e..216a31d94 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,7 +107,7 @@ msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -434,7 +434,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -703,7 +703,7 @@ msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -739,7 +739,7 @@ msgid "Ignore"
 msgstr "Ohita"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Kartta"
 
@@ -1221,7 +1221,7 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -1879,10 +1879,6 @@ msgstr "Hyväksy"
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Muokkaa"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -1927,163 +1923,163 @@ msgstr "Oletus"
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Hirviöt"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Korosta hirviön hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Korosta pelaajan hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Piirrä polku"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Korjaa sijainti automaattisesti"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Näytä työ"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Näytä tausta"
 
@@ -2223,67 +2219,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Kookas (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Suuri (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Jättimäinen (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -3554,6 +3554,10 @@ msgstr "%s ilmoittaa kaikille:"
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Muokkaa"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Jätä pelaaja huomiotta"
diff --git a/po/fr.po b/po/fr.po
index dd19797ae..043fd5c0b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
@@ -110,7 +110,7 @@ msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
@@ -439,7 +439,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Boutique"
 
@@ -708,7 +708,7 @@ msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -744,7 +744,7 @@ msgid "Ignore"
 msgstr "Ignorer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Carte"
 
@@ -1226,7 +1226,7 @@ msgid "Submit"
 msgstr "Soumettre"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "PNJ"
 
@@ -1883,10 +1883,6 @@ msgstr "Appliquer"
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Éditer"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -1931,163 +1927,163 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Entourer les monstres visés"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les items sur le sol"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Montrer les mini cartes étendues"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Afficher le chemin"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Afficher les touches-raccourcis sur la carte"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "En mouvement"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-correction de position"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Programme A de mouvement de fou"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Entourer les joueurs visés"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Message d'absence"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Afficher les compétences"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Autre"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Activer la protection contre les serveurs instables"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Montrer le fond"
 
@@ -2227,67 +2223,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Petite (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Grande (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grand (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Immense (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
@@ -3575,6 +3575,10 @@ msgstr "Annonce globale de %s :"
 msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Éditer"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignore l'autre joueur"
diff --git a/po/hr.po b/po/hr.po
index f208048c2..49002ec23 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,7 +107,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -437,7 +437,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Trgovina"
 
@@ -706,7 +706,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -742,7 +742,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Karta"
 
@@ -1226,7 +1226,7 @@ msgid "Submit"
 msgstr "Dostavi"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1882,10 +1882,6 @@ msgstr "Primjeni"
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
@@ -1930,163 +1926,163 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Čudovišta"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2226,67 +2222,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
@@ -3555,6 +3555,10 @@ msgstr "Javna obavijest od %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 101fc0090..4bbda2e71 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,7 +106,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -432,7 +432,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Üzlet"
 
@@ -701,7 +701,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -737,7 +737,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Térkép"
 
@@ -1219,7 +1219,7 @@ msgid "Submit"
 msgstr "Küldés"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "Gépjátékos"
 
@@ -1875,10 +1875,6 @@ msgstr "Alkalmaz"
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
@@ -1923,163 +1919,163 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Szörny neve"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2219,67 +2215,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
@@ -3550,6 +3550,10 @@ msgstr "Globális bejelentés (%s) :"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index ac13c61ac..17b54ef61 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
@@ -109,7 +109,7 @@ msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
@@ -430,7 +430,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Toko"
 
@@ -699,7 +699,7 @@ msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -735,7 +735,7 @@ msgid "Ignore"
 msgstr "Abaikan"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Peta"
 
@@ -1215,7 +1215,7 @@ msgid "Submit"
 msgstr "Masukan"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1871,10 +1871,6 @@ msgstr "Terapkan"
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Ganti"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
@@ -1919,163 +1915,163 @@ msgstr "Kembalikan"
 msgid "Key Conflict(s) Detected."
 msgstr "Pertentangan kunci(kunci) terdeteksi."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "macam-macam"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Sorot Jangkauan menyerang monster"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Tampilkan hp bar monster"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Siklus target monster"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Sorot portal peta"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Sorot item yang jatuh"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Sorot Jangkauan menyerang pemain"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Bergerak"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Perbaiki posisi otomatis"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Lainnya"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
@@ -2215,67 +2211,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Besar (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Sangat besar (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Sangat besar sekali (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Ukuran huruf"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
@@ -3543,6 +3543,10 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Ganti"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7a95c076f..8d21f6633 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
 # sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -109,7 +110,7 @@ msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
@@ -139,9 +140,11 @@ msgstr "空のメッセージを送信することはできません！"
 #: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
-msgstr "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分です。"
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
+"です。"
 
 #: src/commandhandler.cpp:435
 #, c-format
@@ -290,7 +293,9 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
+msgstr ""
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"。"
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -427,7 +432,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "店"
 
@@ -696,7 +701,7 @@ msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -732,7 +737,7 @@ msgid "Ignore"
 msgstr "無視"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地図"
 
@@ -1212,7 +1217,7 @@ msgid "Submit"
 msgstr "決定"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1715,7 +1720,9 @@ msgstr "お知らせ"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr "新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性がある"
+msgstr ""
+"新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性"
+"がある"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1868,10 +1875,6 @@ msgstr "適用"
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "エディット"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "ボタンを押すと較正が始まります。"
@@ -1916,163 +1919,163 @@ msgstr "標準に戻す"
 msgid "Key Conflict(s) Detected."
 msgstr "キーが重複しています。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "他"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "モンスター"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えた損傷を表示する"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "モンスターHPバーを表示する"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "パスを描画"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "仕事を表示する"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "デバッグループを有効にする"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "背景を表示する"
 
@@ -2212,67 +2215,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "無視の際には："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "小さい (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "小（11）"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "媒体（12）"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "大（13）"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "ビッグ（14）"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "巨大（15）"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "粒子のフォント"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "テーマは変えました"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
@@ -3231,9 +3238,10 @@ msgid "Change"
 msgstr "変更"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません！"
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
+"複して追加することは出来ません！"
 
 #: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
@@ -3505,11 +3513,15 @@ msgstr "このコマンドでは、入力したユーザーをチャンネルの
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
 #: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
+msgstr ""
+"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
+"囲んでください。"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr "チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出すことができます。"
+msgstr ""
+"チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
+"ことができます。"
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3541,6 +3553,10 @@ msgstr "%sからのアナウンス:"
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "エディット"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > 他のプレイヤーを無視する"
@@ -3559,7 +3575,8 @@ msgstr "コマンド: /close"
 
 #: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
-msgstr "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr ""
+"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
@@ -3574,8 +3591,7 @@ msgid "Command: /unignore <player>"
 msgstr "コマンド：　/unignore <プレイヤー>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4513,7 +4529,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にするために、「0」、「no」か「false」を設定ください。"
+"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にす"
+"るために、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4536,7 +4553,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にする場合、「0」、「no」か「false」を設定ください。"
+"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
+"る場合、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4731,7 +4749,9 @@ msgstr "ゲームを続けるためにはコインを入れてください。"
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
+msgstr ""
+"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
+"向かっただけ。"
 
 #: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
@@ -4790,7 +4810,9 @@ msgstr "命を失い、天国に向かった。"
 
 #: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃないか？"
+msgstr ""
+"もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
+"ないか？"
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
@@ -4825,8 +4847,7 @@ msgstr "メッセージ"
 
 #: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
 
 #: src/net/ea/playerhandler.cpp:347
@@ -5458,5 +5479,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "不明なアイテム"
-
-
diff --git a/po/manaplus.pot b/po/manaplus.pot
index fd3517a1d..08ef05f5c 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,7 +107,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -430,7 +430,7 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr ""
 
@@ -699,7 +699,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -735,7 +735,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr ""
 
@@ -1217,7 +1217,7 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr ""
 
@@ -1873,10 +1873,6 @@ msgstr ""
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
@@ -1921,163 +1917,163 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2217,67 +2213,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -3545,6 +3545,10 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index de3106afe..c4e2b5925 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
@@ -108,7 +108,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -434,7 +434,7 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Winkel"
 
@@ -703,7 +703,7 @@ msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -739,7 +739,7 @@ msgid "Ignore"
 msgstr "Negeer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Map"
 
@@ -1221,7 +1221,7 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1879,10 +1879,6 @@ msgstr "Toepassen"
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Wijzig"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -1927,163 +1923,163 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Automatisch enkel bereikbare monsters viseren"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Markeer het aanvalsbereik van de monsters"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Toon hp statusbalk van monsters"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Markeer het aanvalsbereik van de speler"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Aanvallen tijdens verplaatsen"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2223,67 +2219,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Thema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Standaard Lettertype"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Vet lettertype"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Help lettertype"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -3561,6 +3561,10 @@ msgstr "Globale aankondiging van %s:"
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Wijzig"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Negeer de andere speler"
diff --git a/po/pt.po b/po/pt.po
index eb4b45e79..b989aaf4e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
@@ -109,7 +109,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
@@ -435,7 +435,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Loja"
 
@@ -704,7 +704,7 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -740,7 +740,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -1222,7 +1222,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1879,10 +1879,6 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1927,163 +1923,163 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Outro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -2223,67 +2219,71 @@ msgstr "Relações"
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3557,6 +3557,10 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d40dd0ee6..f8646cbc4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
@@ -111,7 +111,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
@@ -437,7 +437,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Loja"
 
@@ -706,7 +706,7 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -742,7 +742,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -1224,7 +1224,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1881,10 +1881,6 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1929,163 +1925,163 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Outro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -2225,67 +2221,71 @@ msgstr "Relações"
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3559,6 +3559,10 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
diff --git a/po/ru.po b/po/ru.po
index 59eb7179d..9b9772b33 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:03+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:10+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -111,7 +111,7 @@ msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
@@ -443,7 +443,7 @@ msgid "Max"
 msgstr "Макс"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Магазин"
 
@@ -712,7 +712,7 @@ msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -748,7 +748,7 @@ msgid "Ignore"
 msgstr "Игнорировать"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Карта"
 
@@ -1232,7 +1232,7 @@ msgid "Submit"
 msgstr "Применить"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1889,10 +1889,6 @@ msgstr "Применить"
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Изменить"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -1937,163 +1933,163 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Монстры"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр., нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Рисовать путь"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Рисовать клавиши на карте"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Движения"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Синх. движение"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Другое"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Включить защиту от сбойных серверов"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Показать фон"
 
@@ -2238,67 +2234,71 @@ msgstr "Связи"
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Большой (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Боьшой (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Огромный (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Основной шрифт"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Японский шрифт"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
@@ -3575,6 +3575,10 @@ msgstr "Глобальное объявление от %s:"
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Изменить"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Игнорировать другого игрока"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e2b281bb8..1d6c18fdc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <colorfullife81@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
+"team/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -107,7 +108,7 @@ msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -137,8 +138,8 @@ msgstr "无法发送空白密语！"
 #: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
 #: src/commandhandler.cpp:435
@@ -425,7 +426,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "商店"
 
@@ -694,7 +695,7 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -730,7 +731,7 @@ msgid "Ignore"
 msgstr "忽略"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地图"
 
@@ -1210,7 +1211,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1866,10 +1867,6 @@ msgstr "应用"
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "编辑"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
@@ -1914,163 +1911,163 @@ msgstr "预设"
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "杂项"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "显示损坏造成的，以怪物"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "自动目标只有到达怪物"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "突出显示怪物的攻击范围"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "显示怪物HP栏"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "突出显示的地图门户网站"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "突出地板项目"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "突出显示球员的攻击范围"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "绘制路径"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "移动"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "自动修复的位置"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "同步播放移动"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "启用店模式"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "其他"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "启用BOT检查"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "启用BUG保护"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "显示背景"
 
@@ -2210,67 +2207,71 @@ msgstr "关系"
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "小（10）"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "小 (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "中 (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "大 (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "大(14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "巨大的 (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "主题"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "桂主题"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "主要字体"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "加粗字体"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "粒子字体"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "帮助字体"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "字体大小"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
@@ -3229,8 +3230,7 @@ msgid "Change"
 msgstr "改变"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: src/gui/tradewindow.cpp:377
@@ -3539,6 +3539,10 @@ msgstr "%s 全局公告："
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "编辑"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > "
@@ -3572,8 +3576,7 @@ msgid "Command: /unignore <player>"
 msgstr "命令: /uninore <>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
 #: src/gui/windowmenu.cpp:65
@@ -4510,7 +4513,9 @@ msgstr "改命令改变帮会的物品共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\","
+"\"false\"用来禁止物品共享。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4532,7 +4537,9 @@ msgstr "该命令改变帮会的经验共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\",\"false\"用来关闭经验共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
+"\"false\"用来关闭经验共享。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4812,7 +4819,9 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
+"\"false\"用来禁止物品共享。"
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
 #: src/net/ea/playerhandler.cpp:425
@@ -4821,8 +4830,7 @@ msgstr "讯息"
 
 #: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
 #: src/net/ea/playerhandler.cpp:347
@@ -5454,5 +5462,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "未知物品"
-
-
author	Andrei Karas <akaras@inbox.ru>	2011-08-16 19:20:39 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-08-16 19:20:39 +0300
commit	35cf98e57d4dc37ec421288cbe1840ca8fcc3547 (patch)
tree	719c048de6b74b422840c7ef629cf4640f0ee714
parent	92311f100efe888df9f8101d22ba9f2d7b483074 (diff)
download	manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.tar.gz manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.tar.bz2 manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.tar.xz manaverse-35cf98e57d4dc37ec421288cbe1840ca8fcc3547.zip