Transifexと同期

[wesnoth-ja/ja-po.git] / wesnoth-lib / ja.po

diff --git a/wesnoth-lib/ja.po b/wesnoth-lib/ja.po
index 6136c1f..4ff44ae 100644 (file)
--- a/wesnoth-lib/ja.po
+++ b/wesnoth-lib/ja.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Automatically generated, 2005
-# Masaharu IWAI <iwaim.sub@gmail.com>, 2010
+# IWAI, Masaharu <iwaim.sub@gmail.com>, 2010
 # MATSUMOTO Yuji <matumoto@marron.cias.osakafu-u.ac.jp>, 2005
-# RatArmy <broadbarredfirefish@gmail.com>, 2015-2016
+# RatArmy <broadbarredfirefish@gmail.com>, 2015-2017
+# 家庭的の人 <kateitekino_hito@yahoo.co.jp>, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Wesnoth-Dev Japanese\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
-"POT-Creation-Date: 2016-11-26 01:40 UTC\n"
-"PO-Revision-Date: 2016-11-26 01:43+0000\n"
+"POT-Creation-Date: 2018-03-22 01:35 UTC\n"
+"PO-Revision-Date: 2018-03-22 01:37+0000\n"
 "Last-Translator: RatArmy <broadbarredfirefish@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/wesnoth-jp/wesnoth-dev-japanese/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +23,20 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. [terrain_type]: id=farmer-fence  # AI-animal-proof fences from first
+#. scenario
+#. [terrain_type]: id=fence
+#: data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg:6
+#: data/core/terrain.cfg:464
+msgid "Fence"
+msgstr "柵"
+
 #. [terrain_type]: id=deep_water_gray
 #. [terrain_type]: id=deep_water_medium
 #. [terrain_type]: id=deep_water_tropical
 #. [terrain_type]: id=deep_water
 #: data/core/terrain.cfg:20 data/core/terrain.cfg:31 data/core/terrain.cfg:42
-#: data/core/terrain.cfg:2534 data/core/terrain.cfg:2535
+#: data/core/terrain.cfg:2905 data/core/terrain.cfg:2906
 msgid "Deep Water"
 msgstr "深水"
 
@@ -51,7 +60,7 @@ msgstr "熱帯の深水"
 #. [terrain_type]: id=tropical_water
 #. [terrain_type]: id=shallow_water
 #: data/core/terrain.cfg:53 data/core/terrain.cfg:64 data/core/terrain.cfg:75
-#: data/core/terrain.cfg:2493 data/core/terrain.cfg:2494
+#: data/core/terrain.cfg:2864 data/core/terrain.cfg:2865
 msgid "Shallow Water"
 msgstr "浅瀬"
 
@@ -91,8 +100,8 @@ msgstr "川が極端に浅い場合、陸上のユニットでも楽に渡るこ
 #. [terrain_type]: id=tropical_reef
 #. [terrain_type]: id=reef
 #: data/core/terrain.cfg:98 data/core/terrain.cfg:109
-#: data/core/terrain.cfg:120 data/core/terrain.cfg:2448
-#: data/core/terrain.cfg:2449
+#: data/core/terrain.cfg:120 data/core/terrain.cfg:2819
+#: data/core/terrain.cfg:2820
 msgid "Coastal Reef"
 msgstr "岩礁"
 
@@ -115,7 +124,7 @@ msgstr "熱帯の岩礁"
 #. [terrain_type]: id=quagmire
 #. [terrain_type]: id=swamp_water
 #: data/core/terrain.cfg:133 data/core/terrain.cfg:144
-#: data/core/terrain.cfg:2477 data/core/terrain.cfg:2478
+#: data/core/terrain.cfg:2848 data/core/terrain.cfg:2849
 msgid "Swamp"
 msgstr "沼地"
 
@@ -187,8 +196,8 @@ msgstr "乾いた荒地"
 #. [terrain_type]: id=flagstones_dark
 #. [terrain_type]: id=cave_path
 #: data/core/terrain.cfg:236 data/core/terrain.cfg:247
-#: data/core/terrain.cfg:257 data/core/terrain.cfg:866
-#: data/core/terrain.cfg:876
+#: data/core/terrain.cfg:257 data/core/terrain.cfg:918
+#: data/core/terrain.cfg:928
 msgid "Road"
 msgstr "道"
 
@@ -245,7 +254,7 @@ msgstr "<italic>text='砂漠'</italic>は砂地やビーチとはいくらか異
 
 #. [terrain_type]: id=sand_beach
 #. [terrain_type]: id=sand
-#: data/core/terrain.cfg:304 data/core/terrain.cfg:2435
+#: data/core/terrain.cfg:304 data/core/terrain.cfg:2806
 msgid "Sand"
 msgstr "砂地"
 
@@ -256,7 +265,7 @@ msgstr "砂浜"
 
 #. [terrain_type]: id=sand_beach
 #. [terrain_type]: id=sand
-#: data/core/terrain.cfg:309 data/core/terrain.cfg:2439
+#: data/core/terrain.cfg:309 data/core/terrain.cfg:2810
 msgid ""
 "The instability of <italic>text='sand'</italic> makes it harder for most units to cross, and leaves them wide open to attack. In contrast, the wide feet or snakelike bodies of the reptilian races make sand much easier for them to navigate.\n"
 "\n"
@@ -268,110 +277,117 @@ msgstr "<italic>text='砂地'</italic>では多くのユニットが足を取ら
 msgid "Oasis"
 msgstr "オアシス"
 
+#. [terrain_type]: id=oasis
+#: data/core/terrain.cfg:326
+msgid ""
+"A welcome sight to any traveler, an oasis allows units to heal as if "
+"stationed in a village, but provides no income or defensive advantage."
+msgstr "オアシスは旅人にはありがたい地形です。オアシスでは、村に滞在しているときと同様にユニットは回復できます。しかし、村と違って収入は増えませんし、防御面でのアドバンテージを得ることもできません。"
+
 #. [terrain_type]: id=sand_rubble
-#: data/core/terrain.cfg:329
+#: data/core/terrain.cfg:332
 msgid "Rubble"
 msgstr "瓦礫"
 
 #. [terrain_type]: id=crater
-#: data/core/terrain.cfg:339
+#: data/core/terrain.cfg:342
 msgid "Crater"
 msgstr "クレーター"
 
 #. [terrain_type]: id=flowers_mixed
-#: data/core/terrain.cfg:353
+#: data/core/terrain.cfg:356
 msgid "Mixed Flowers"
 msgstr "花"
 
 #. [terrain_type]: id=farm
-#: data/core/terrain.cfg:362
+#: data/core/terrain.cfg:365
 msgid "Farmland"
 msgstr "農地"
 
 #. [terrain_type]: id=stones_small
-#: data/core/terrain.cfg:371
+#: data/core/terrain.cfg:374
 msgid "Stones"
 msgstr "石"
 
 #. [terrain_type]: id=mushrooms_small
-#: data/core/terrain.cfg:380
+#: data/core/terrain.cfg:383
 msgid "Small Mushrooms"
 msgstr "小さなキノコ"
 
 #. [terrain_type]: id=mushrooms_farm
-#: data/core/terrain.cfg:389
+#: data/core/terrain.cfg:392
 msgid "Mushroom Farm"
 msgstr "キノコ畑"
 
 #. [terrain_type]: id=desert_plants
-#: data/core/terrain.cfg:398
+#: data/core/terrain.cfg:401
 msgid "Desert Plants"
 msgstr "砂漠の植物"
 
 #. [terrain_type]: id=desert_plants_sans_bones
-#: data/core/terrain.cfg:407
+#: data/core/terrain.cfg:410
 msgid "Desert Plants without Bones"
 msgstr "砂漠の植物（動物の骨無し）"
 
 #. [terrain_type]: id=windmill
-#: data/core/terrain.cfg:416
+#: data/core/terrain.cfg:419
 msgid "Windmill"
 msgstr "風車"
 
 #. [terrain_type]: id=campfire
-#: data/core/terrain.cfg:425
+#: data/core/terrain.cfg:428
 msgid "Campfire"
 msgstr "キャンプファイア"
 
+#. [terrain_type]: id=wallfire
+#: data/core/terrain.cfg:437
+msgid "Sconce"
+msgstr "燭台"
+
 #. [terrain_type]: id=brazier
-#: data/core/terrain.cfg:434
+#: data/core/terrain.cfg:446
 msgid "Brazier"
 msgstr "火鉢"
 
 #. [terrain_type]: id=brazier-lit
-#: data/core/terrain.cfg:443
+#: data/core/terrain.cfg:455
 msgid "Lit Brazier"
 msgstr "燃える火鉢"
 
-#. [terrain_type]: id=fence
-#: data/core/terrain.cfg:452
-msgid "Fence"
-msgstr "柵"
-
 #. [terrain_type]: id=sand_drifts
-#: data/core/terrain.cfg:461
+#: data/core/terrain.cfg:473
 msgid "Stones with Sand Drifts"
 msgstr "漂砂と石"
 
 #. [terrain_type]: id=water-lilies
-#: data/core/terrain.cfg:470
+#: data/core/terrain.cfg:482
 msgid "Water Lilies"
 msgstr "睡蓮"
 
 #. [terrain_type]: id=water-lilies-flower
-#: data/core/terrain.cfg:480
+#: data/core/terrain.cfg:492
 msgid "Flowering Water Lilies"
 msgstr "花咲く睡蓮"
 
 #. [terrain_type]: id=detritus_trash
-#: data/core/terrain.cfg:491
+#: data/core/terrain.cfg:503
 msgid "Trash"
 msgstr "ゴミ"
 
 #. [terrain_type]: id=detritus_bones
-#: data/core/terrain.cfg:500
+#: data/core/terrain.cfg:512
 msgid "Remains"
 msgstr "残骸"
 
 #. [terrain_type]: id=great_tree
 #. [terrain_type]: id=great_tree_dead
-#: data/core/terrain.cfg:513 data/core/terrain.cfg:514
-#: data/core/terrain.cfg:525
+#: data/core/terrain.cfg:525 data/core/terrain.cfg:526
+#: data/core/terrain.cfg:537
 msgid "Great Tree"
 msgstr "大木"
 
 #. [terrain_type]: id=great_tree_dead
-#: data/core/terrain.cfg:526
+#: data/core/terrain.cfg:538
 msgid "Dead Great Tree"
 msgstr "枯れた大木"
 
@@ -391,90 +407,90 @@ msgstr "枯れた大木"
 #. [terrain_type]: id=mixed_forest_winter
 #. [terrain_type]: id=mixed_forest_winter_snow
 #. [terrain_type]: id=forest
-#: data/core/terrain.cfg:537 data/core/terrain.cfg:549
-#: data/core/terrain.cfg:561 data/core/terrain.cfg:573
-#: data/core/terrain.cfg:585 data/core/terrain.cfg:597
-#: data/core/terrain.cfg:609 data/core/terrain.cfg:621
-#: data/core/terrain.cfg:633 data/core/terrain.cfg:645
-#: data/core/terrain.cfg:657 data/core/terrain.cfg:669
-#: data/core/terrain.cfg:681 data/core/terrain.cfg:693
-#: data/core/terrain.cfg:705 data/core/terrain.cfg:2560
-#: data/core/terrain.cfg:2561
+#: data/core/terrain.cfg:549 data/core/terrain.cfg:561
+#: data/core/terrain.cfg:573 data/core/terrain.cfg:585
+#: data/core/terrain.cfg:597 data/core/terrain.cfg:609
+#: data/core/terrain.cfg:621 data/core/terrain.cfg:633
+#: data/core/terrain.cfg:645 data/core/terrain.cfg:657
+#: data/core/terrain.cfg:669 data/core/terrain.cfg:681
+#: data/core/terrain.cfg:693 data/core/terrain.cfg:705
+#: data/core/terrain.cfg:717 data/core/terrain.cfg:2931
+#: data/core/terrain.cfg:2932
 msgid "Forest"
 msgstr "森"
 
 #. [terrain_type]: id=tropical_forest
-#: data/core/terrain.cfg:538
+#: data/core/terrain.cfg:550
 msgid "Tropical Forest"
 msgstr "熱帯林"
 
 #. [terrain_type]: id=rainforest
-#: data/core/terrain.cfg:550
+#: data/core/terrain.cfg:562
 msgid "Rainforest"
 msgstr "雨林"
 
 #. [terrain_type]: id=palm_desert_forest
-#: data/core/terrain.cfg:562
+#: data/core/terrain.cfg:574
 msgid "Palm Forest"
 msgstr "ヤシ林"
 
 #. [terrain_type]: id=palm_forest
-#: data/core/terrain.cfg:574
+#: data/core/terrain.cfg:586
 msgid "Dense Palm Forest"
 msgstr "ヤシの密林"
 
 #. [terrain_type]: id=savanna_forest
-#: data/core/terrain.cfg:586
+#: data/core/terrain.cfg:598
 msgid "Savanna"
 msgstr "サバンナ"
 
 #. [terrain_type]: id=pine_forest
-#: data/core/terrain.cfg:598
+#: data/core/terrain.cfg:610
 msgid "Pine Forest"
 msgstr "松林"
 
 #. [terrain_type]: id=snow_forest
-#: data/core/terrain.cfg:610
+#: data/core/terrain.cfg:622
 msgid "Snowy Pine Forest"
 msgstr "雪の松林"
 
 #. [terrain_type]: id=deciduous_forest_summer
-#: data/core/terrain.cfg:622
+#: data/core/terrain.cfg:634
 msgid "Summer Deciduous Forest"
 msgstr "夏の落葉樹林"
 
 #. [terrain_type]: id=deciduous_forest_fall
-#: data/core/terrain.cfg:634
+#: data/core/terrain.cfg:646
 msgid "Fall Deciduous Forest"
 msgstr "秋の落葉樹林"
 
 #. [terrain_type]: id=deciduous_forest_winter
-#: data/core/terrain.cfg:646
+#: data/core/terrain.cfg:658
 msgid "Winter Deciduous Forest"
 msgstr "冬の落葉樹林"
 
 #. [terrain_type]: id=deciduous_forest_winter_snow
-#: data/core/terrain.cfg:658
+#: data/core/terrain.cfg:670
 msgid "Snowy Deciduous Forest"
 msgstr "雪の落葉樹林"
 
 #. [terrain_type]: id=mixed_forest_summer
-#: data/core/terrain.cfg:670
+#: data/core/terrain.cfg:682
 msgid "Summer Mixed Forest"
 msgstr "夏の混交林"
 
 #. [terrain_type]: id=mixed_forest_fall
-#: data/core/terrain.cfg:682
+#: data/core/terrain.cfg:694
 msgid "Fall Mixed Forest"
 msgstr "秋の混交林"
 
 #. [terrain_type]: id=mixed_forest_winter
-#: data/core/terrain.cfg:694
+#: data/core/terrain.cfg:706
 msgid "Winter Mixed Forest"
 msgstr "冬の混交林"
 
 #. [terrain_type]: id=mixed_forest_winter_snow
-#: data/core/terrain.cfg:706
+#: data/core/terrain.cfg:718
 msgid "Snowy Mixed Forest"
 msgstr "雪の混交林"
 
@@ -482,29 +498,29 @@ msgstr "雪の混交林"
 #. [terrain_type]: id=hills_dry
 #. [terrain_type]: id=snow_hills
 #. [terrain_type]: id=hills
-#: data/core/terrain.cfg:721 data/core/terrain.cfg:731
-#: data/core/terrain.cfg:751 data/core/terrain.cfg:2463
-#: data/core/terrain.cfg:2464
+#: data/core/terrain.cfg:733 data/core/terrain.cfg:743
+#: data/core/terrain.cfg:763 data/core/terrain.cfg:2834
+#: data/core/terrain.cfg:2835
 msgid "Hills"
 msgstr "丘"
 
 #. [terrain_type]: id=hills_regular
-#: data/core/terrain.cfg:722
+#: data/core/terrain.cfg:734
 msgid "Regular Hills"
 msgstr "普通の丘"
 
 #. [terrain_type]: id=hills_dry
-#: data/core/terrain.cfg:732
+#: data/core/terrain.cfg:744
 msgid "Dry Hills"
 msgstr "乾いた丘"
 
 #. [terrain_type]: id=desert_hills
-#: data/core/terrain.cfg:741
+#: data/core/terrain.cfg:753
 msgid "Dunes"
 msgstr "砂丘"
 
 #. [terrain_type]: id=snow_hills
-#: data/core/terrain.cfg:752
+#: data/core/terrain.cfg:764
 msgid "Snow Hills"
 msgstr "雪の丘"
 
@@ -517,117 +533,152 @@ msgstr "雪の丘"
 #. [terrain_type]: id=cloud_snow
 #. [terrain_type]: id=cloud_desert
 #. [terrain_type]: id=mountains
-#: data/core/terrain.cfg:766 data/core/terrain.cfg:776
-#: data/core/terrain.cfg:786 data/core/terrain.cfg:797
-#: data/core/terrain.cfg:1042 data/core/terrain.cfg:1052
-#: data/core/terrain.cfg:1063 data/core/terrain.cfg:1073
-#: data/core/terrain.cfg:2520 data/core/terrain.cfg:2521
+#: data/core/terrain.cfg:778 data/core/terrain.cfg:788
+#: data/core/terrain.cfg:798 data/core/terrain.cfg:809
+#: data/core/terrain.cfg:1097 data/core/terrain.cfg:1107
+#: data/core/terrain.cfg:1118 data/core/terrain.cfg:1128
+#: data/core/terrain.cfg:2891 data/core/terrain.cfg:2892
 msgid "Mountains"
 msgstr "山"
 
 #. [terrain_type]: id=regular_mountains
-#: data/core/terrain.cfg:767
+#: data/core/terrain.cfg:779
 msgid "Regular Mountains"
 msgstr "普通の山"
 
 #. [terrain_type]: id=dry_mountains
-#: data/core/terrain.cfg:777
+#: data/core/terrain.cfg:789
 msgid "Dry Mountains"
 msgstr "乾いた山"
 
 #. [terrain_type]: id=snow_mountains
-#: data/core/terrain.cfg:787
+#: data/core/terrain.cfg:799
 msgid "Snowy Mountains"
 msgstr "雪山"
 
 #. [terrain_type]: id=desert_mountains
-#: data/core/terrain.cfg:798
+#: data/core/terrain.cfg:810
 msgid "Desert Mountains"
 msgstr "砂漠の山"
 
+#. [terrain_type]: id=regular_stone_floor
+#: data/core/terrain.cfg:821
+msgid "Stone Floor"
+msgstr "石の床"
+
+#. [terrain_type]: id=regular_stone_floor
+#: data/core/terrain.cfg:824
+msgid "Basic Stone Floor"
+msgstr "普通の石の床"
+
+#. [terrain_type]: id=rug_floor
+#. [terrain_type]: id=rug2_floor
+#. [terrain_type]: id=rug3_floor
+#: data/core/terrain.cfg:831 data/core/terrain.cfg:841
+#: data/core/terrain.cfg:851
+msgid "Rug"
+msgstr "敷物"
+
+#. [terrain_type]: id=rug_floor
+#: data/core/terrain.cfg:834
+msgid "Royal Rug"
+msgstr "高貴な敷物"
+
+#. [terrain_type]: id=rug2_floor
+#: data/core/terrain.cfg:844
+msgid "Normal Rug"
+msgstr "普通の敷物"
+
+#. [terrain_type]: id=rug3_floor
+#: data/core/terrain.cfg:854
+msgid "Cave Rug"
+msgstr "洞窟の敷物"
+
 #. [terrain_type]: id=wood_floor
-#: data/core/terrain.cfg:809
+#: data/core/terrain.cfg:861
 msgid "Wooden Floor"
 msgstr "木の床"
 
 #. [terrain_type]: id=wood_floor
-#: data/core/terrain.cfg:812
+#: data/core/terrain.cfg:864
 msgid "Basic Wooden Floor"
 msgstr "普通の木の床"
 
 #. [terrain_type]: id=old_wood_floor
-#: data/core/terrain.cfg:819 data/core/terrain.cfg:822
+#: data/core/terrain.cfg:871 data/core/terrain.cfg:874
 msgid "Old Wooden Floor"
 msgstr "古い木の床"
 
 #. [terrain_type]: id=lit
-#: data/core/terrain.cfg:835
+#: data/core/terrain.cfg:887
 msgid "Lit"
 msgstr "光"
 
 #. [terrain_type]: id=lit
-#: data/core/terrain.cfg:836
+#: data/core/terrain.cfg:888
 msgid "Beam of Light"
 msgstr "差し込む光"
 
 #. [terrain_type]: id=cave_floor
 #. [terrain_type]: id=cave_earthy
 #. [terrain_type]: id=cave
-#: data/core/terrain.cfg:846 data/core/terrain.cfg:856
-#: data/core/terrain.cfg:2420 data/core/terrain.cfg:2421
+#: data/core/terrain.cfg:898 data/core/terrain.cfg:908
+#: data/core/terrain.cfg:2791 data/core/terrain.cfg:2792
 msgid "Cave"
 msgstr "洞窟"
 
 #. [terrain_type]: id=cave_floor
-#: data/core/terrain.cfg:847
+#: data/core/terrain.cfg:899
 msgid "Cave Floor"
 msgstr "洞窟の床"
 
 #. [terrain_type]: id=cave_earthy
-#: data/core/terrain.cfg:857
+#: data/core/terrain.cfg:909
 msgid "Earthy Cave Floor"
 msgstr "土色の洞窟の床"
 
 #. [terrain_type]: id=flagstones_dark
-#: data/core/terrain.cfg:867
+#: data/core/terrain.cfg:919
 msgid "Dark Flagstones"
 msgstr "黒っぽい敷石"
 
 #. [terrain_type]: id=cave_path
-#: data/core/terrain.cfg:877
+#: data/core/terrain.cfg:929
 msgid "Cave Path"
 msgstr "洞窟の道"
 
 #. [terrain_type]: id=fungus_grove
 #. [terrain_type]: id=fungus_beam
-#: data/core/terrain.cfg:886 data/core/terrain.cfg:887
-#: data/core/terrain.cfg:897
+#: data/core/terrain.cfg:938 data/core/terrain.cfg:939
+#: data/core/terrain.cfg:949
 msgid "Mushroom Grove"
 msgstr "キノコの森"
 
 #. [terrain_type]: id=fungus_beam
-#: data/core/terrain.cfg:898
+#: data/core/terrain.cfg:950
 msgid "Lit Mushroom Grove"
 msgstr "光り差すキノコの森"
 
 #. [terrain_type]: id=rocky_cave
-#: data/core/terrain.cfg:909 data/core/terrain.cfg:910
+#: data/core/terrain.cfg:961 data/core/terrain.cfg:962
 msgid "Rockbound Cave"
-msgstr "岩石洞窟"
+msgstr "岩に囲まれた洞窟"
 
 #. [terrain_type]: id=rocky_cave
-#: data/core/terrain.cfg:915
+#: data/core/terrain.cfg:967
 msgid ""
-"<italic>text='Rockbound cave'</italic> terrain is formed by the action of water and wind, carrying erosive particles that carve the rock. It resembles a scraggy underground cavern which reduces efficiency of most units, but shoulders defense. Dwarves and trolls, who are main settlers of caves, have a relatively easy time navigating this terrain. Dwarves, who by dint of their small size have the full advantage of navigation in such topography. Occasionally caves are <ref>dst='terrain_illuminated_cave' text='illuminated'</ref>\n"
+"<italic>text='Rockbound cave'</italic> terrain is formed by the action of water and wind, carrying erosive particles that carve the rock. It resembles a scraggy underground cavern which shoulders defense, but is hard for most units to traverse. Only settlers of caves, such as dwarves and trolls, are fully capable of navigating such topography.\n"
 "\n"
-"Most units have about 50% defense in rocky caves, whereas cavalry are limited to 40%. Dwarves enjoy 60% defense in rockbound caves."
-msgstr "<italic>text='岩に囲まれた洞窟'</italic>は、風雨の働きによって岩石が侵食されて形作られました。でこぼこの地下洞窟に似ており、多くのユニットは能力を制限されますが、守備力は上がります。ドワーフとトロルは洞窟の住人であり、比較的楽にこの地形を移動することができます。その小さな体によって、ドワーフは機動力のアドバンテージを十分に得ることができます。時折、洞窟の中には<ref>dst='terrain_illuminated_cave' text='照らされている場所'</ref>場所があります。\n\n多くのユニットは50%の回避率となり、騎兵は40%に限られます。しかし、ドワーフは60%の回避率を得ることができます。"
+"Most units have about 50% defense in rocky caves, whereas cavalry are limited to 40%. Dwarves, by dint of their small size, enjoy 60% defense in rockbound caves.\n"
+"\n"
+"Occasionally caves are <ref>dst='terrain_illuminated_cave' text='illuminated'</ref>."
+msgstr "<italic>text='岩に囲まれた洞窟'</italic>は、風雨の働きによって岩石が侵食されて形作られました。でこぼこの地下洞窟に似ており、多くのユニットにとって、回避率は上がるものの、通過するのは困難な地形です。ドワーフとトロルのような洞窟の住人のみ、この地形をうまく通過する十分な能力を有しています。\n\n岩に囲まれた洞窟において、多くのユニットの回避率は50%となり、騎兵は40%に制限されます。しかし、ドワーフはその短身により、60%の回避率の恩恵に与ることができます。\n\n時折、洞窟の中には<ref>dst='terrain_illuminated_cave' text='照らされている場所'</ref>があります。"
 
 #. [terrain_type]: id=mine_rails
 #. [terrain_type]: id=mine_railsdiag1
 #. [terrain_type]: id=mine_railsdiag2
-#: data/core/terrain.cfg:925 data/core/terrain.cfg:937
-#: data/core/terrain.cfg:950
+#: data/core/terrain.cfg:979 data/core/terrain.cfg:991
+#: data/core/terrain.cfg:1004
 msgid "Mine Rail"
 msgstr "鉱山のレール"
 
@@ -635,38 +686,38 @@ msgstr "鉱山のレール"
 #. [terrain_type]: id=chasm_earthy
 #. [terrain_type]: id=abyss
 #. [terrain_type]: id=lava_chasm
-#: data/core/terrain.cfg:968 data/core/terrain.cfg:979
-#: data/core/terrain.cfg:990 data/core/terrain.cfg:1001
+#: data/core/terrain.cfg:1022 data/core/terrain.cfg:1033
+#: data/core/terrain.cfg:1044 data/core/terrain.cfg:1055
 msgid "Chasm"
 msgstr "裂け目"
 
 #. [terrain_type]: id=canyon
-#: data/core/terrain.cfg:969
+#: data/core/terrain.cfg:1023
 msgid "Regular Chasm"
 msgstr "普通の裂け目"
 
 #. [terrain_type]: id=chasm_earthy
-#: data/core/terrain.cfg:980
+#: data/core/terrain.cfg:1034
 msgid "Earthy Chasm"
 msgstr "土色の裂け目"
 
 #. [terrain_type]: id=abyss
-#: data/core/terrain.cfg:991
+#: data/core/terrain.cfg:1045
 msgid "Ethereal Abyss"
 msgstr "神秘の裂け目"
 
 #. [terrain_type]: id=lava_chasm
-#: data/core/terrain.cfg:1002
+#: data/core/terrain.cfg:1056
 msgid "Lava Chasm"
 msgstr "溶岩の裂け目"
 
 #. [terrain_type]: id=lava
-#: data/core/terrain.cfg:1013 data/core/terrain.cfg:1014
+#: data/core/terrain.cfg:1068 data/core/terrain.cfg:1069
 msgid "Lava"
 msgstr "溶岩"
 
 #. [terrain_type]: id=lava
-#: data/core/terrain.cfg:1020
+#: data/core/terrain.cfg:1075
 msgid ""
 "The dangers inherent in trying to walk on <italic>text='lava'</italic> are "
 "fairly obvious. As far as movement is concerned, lava is equivalent to "
@@ -678,111 +729,175 @@ msgid ""
 msgstr "<italic>text='溶岩'</italic>を渡る際の危険性については明白でしょう。溶岩は<ref>dst='terrain_unwalkable' text='歩行不能'</ref>地形として扱われ、飛行ユニットだけが通行することができます。また、溶解したマグマは周囲を照らします。従って、秩序ユニットの攻撃力は上昇し、混沌ユニットの攻撃力は低下します。"
 
 #. [terrain_type]: id=volcano
-#: data/core/terrain.cfg:1027
+#: data/core/terrain.cfg:1082
 msgid "Volcano"
 msgstr "火山"
 
 #. [terrain_type]: id=cloud
-#: data/core/terrain.cfg:1043
+#: data/core/terrain.cfg:1098
 msgid "Regular Impassable Mountains"
 msgstr "普通の通れない山"
 
 #. [terrain_type]: id=cloud_dry
-#: data/core/terrain.cfg:1053
+#: data/core/terrain.cfg:1108
 msgid "Dry Impassable Mountains"
 msgstr "乾いた通行不能の山"
 
 #. [terrain_type]: id=cloud_snow
-#: data/core/terrain.cfg:1064
+#: data/core/terrain.cfg:1119
 msgid "Snowy Impassable Mountains"
 msgstr "雪の通れない山"
 
 #. [terrain_type]: id=cloud_desert
-#: data/core/terrain.cfg:1074
+#: data/core/terrain.cfg:1129
 msgid "Desert Impassable Mountains"
 msgstr "砂漠の通れない山"
 
 #. [terrain_type]: id=cavewall
 #. [terrain_type]: id=cavewall_earthy
 #. [terrain_type]: id=cavewall_earthy_hewn
-#: data/core/terrain.cfg:1084 data/core/terrain.cfg:1106
-#: data/core/terrain.cfg:1120
+#: data/core/terrain.cfg:1139 data/core/terrain.cfg:1161
+#: data/core/terrain.cfg:1175
 msgid "Cave Wall"
 msgstr "洞窟の壁"
 
 #. [terrain_type]: id=cavewall
-#: data/core/terrain.cfg:1085
+#: data/core/terrain.cfg:1140
 msgid "Natural Cave Wall"
 msgstr "自然な洞窟の壁"
 
 #. [terrain_type]: id=minewall
-#: data/core/terrain.cfg:1095 data/core/terrain.cfg:1096
+#. [terrain_type]: id=wall_stone_mine
+#: data/core/terrain.cfg:1150 data/core/terrain.cfg:1151
+#: data/core/terrain.cfg:1208
 msgid "Mine Wall"
 msgstr "鉱山の壁"
 
 #. [terrain_type]: id=cavewall_earthy
-#: data/core/terrain.cfg:1107
+#: data/core/terrain.cfg:1162
 msgid "Natural Earthy Cave Wall"
 msgstr "自然な土色の洞窟の壁"
 
 #. [terrain_type]: id=wall_stone
 #. [terrain_type]: id=wall_stone_lit
-#: data/core/terrain.cfg:1131 data/core/terrain.cfg:1141
+#. [terrain_type]: id=wall_stone_clean
+#: data/core/terrain.cfg:1186 data/core/terrain.cfg:1196
+#: data/core/terrain.cfg:1230
 msgid "Stone Wall"
 msgstr "石壁"
 
 #. [terrain_type]: id=wall_stone_lit
-#: data/core/terrain.cfg:1142
+#: data/core/terrain.cfg:1197
 msgid "Lit Stone Wall"
 msgstr "照らされた石壁"
 
+#. [terrain_type]: id=wall_stone_mine
+#: data/core/terrain.cfg:1209
+msgid "Straight Mine Wall"
+msgstr "まっすぐな鉱山の壁"
+
+#. [terrain_type]: id=wall_stone_white
+#: data/core/terrain.cfg:1219
+msgid "Interior Wall"
+msgstr "屋内の壁"
+
+#. [terrain_type]: id=wall_stone_white
+#: data/core/terrain.cfg:1220
+msgid "Straight White Wall"
+msgstr "まっすぐな白い壁"
+
+#. [terrain_type]: id=wall_stone_clean
+#: data/core/terrain.cfg:1231
+msgid "Clean Stone Wall"
+msgstr "綺麗な石壁"
+
+#. [terrain_type]: id=portal_gate_rusty_sw
+#. [terrain_type]: id=portal_gate_rusty_se
+#. [terrain_type]: id=portal_gate_rusty_n
+#. [terrain_type]: id=portal_gate_rusty_open_sw
+#. [terrain_type]: id=portal_gate_rusty_open_se
+#. [terrain_type]: id=portal_gate_rusty_open_n
 #. [terrain_type]: id=portal_gate_rusty
 #. [terrain_type]: id=p_open_rusty
-#: data/core/terrain.cfg:1152 data/core/terrain.cfg:1178
+#: data/core/terrain.cfg:1247 data/core/terrain.cfg:1260
+#: data/core/terrain.cfg:1274 data/core/terrain.cfg:1331
+#: data/core/terrain.cfg:1343 data/core/terrain.cfg:1356
+#: data/core/terrain.cfg:1412 data/core/terrain.cfg:1442
 msgid "Gate"
 msgstr "門"
 
+#. [terrain_type]: id=portal_gate_rusty_sw
+#. [terrain_type]: id=portal_gate_rusty_se
+#. [terrain_type]: id=portal_gate_rusty_n
 #. [terrain_type]: id=portal_gate_rusty
-#: data/core/terrain.cfg:1153
+#: data/core/terrain.cfg:1248 data/core/terrain.cfg:1261
+#: data/core/terrain.cfg:1275 data/core/terrain.cfg:1413
 msgid "Rusty Gate"
 msgstr "錆びた門"
 
+#. [terrain_type]: id=portal_door_wooden_sw
+#. [terrain_type]: id=portal_door_wooden_se
+#. [terrain_type]: id=portal_door_wooden_n
+#. [terrain_type]: id=portal_door_wooden_open_sw
+#. [terrain_type]: id=portal_door_wooden_open_se
+#. [terrain_type]: id=portal_door_wooden_open_n
 #. [terrain_type]: id=portal_door_wooden
 #. [terrain_type]: id=p_open_wooden
-#: data/core/terrain.cfg:1165 data/core/terrain.cfg:1190
+#: data/core/terrain.cfg:1288 data/core/terrain.cfg:1301
+#: data/core/terrain.cfg:1315 data/core/terrain.cfg:1369
+#: data/core/terrain.cfg:1381 data/core/terrain.cfg:1394
+#: data/core/terrain.cfg:1427 data/core/terrain.cfg:1456
 msgid "Door"
 msgstr "扉"
 
+#. [terrain_type]: id=portal_door_wooden_sw
+#. [terrain_type]: id=portal_door_wooden_se
+#. [terrain_type]: id=portal_door_wooden_n
 #. [terrain_type]: id=portal_door_wooden
-#: data/core/terrain.cfg:1166
+#: data/core/terrain.cfg:1289 data/core/terrain.cfg:1302
+#: data/core/terrain.cfg:1316 data/core/terrain.cfg:1428
 msgid "Wooden Door"
 msgstr "木の扉"
 
+#. [terrain_type]: id=portal_gate_rusty_open_sw
+#. [terrain_type]: id=portal_gate_rusty_open_se
+#. [terrain_type]: id=portal_gate_rusty_open_n
+#: data/core/terrain.cfg:1332 data/core/terrain.cfg:1344
+#: data/core/terrain.cfg:1357
+msgid "Open Rusty Gate"
+msgstr "開いている錆びた門"
+
+#. [terrain_type]: id=portal_door_wooden_open_sw
+#. [terrain_type]: id=portal_door_wooden_open_se
+#. [terrain_type]: id=portal_door_wooden_open_n
+#: data/core/terrain.cfg:1370 data/core/terrain.cfg:1382
+#: data/core/terrain.cfg:1395
+msgid "Open Wooden Door"
+msgstr "開いている木の扉"
+
 #. [terrain_type]: id=p_open_rusty
-#: data/core/terrain.cfg:1179
+#: data/core/terrain.cfg:1443
 msgid "Rusty Open Gate"
 msgstr "開いた錆びた門"
 
 #. [terrain_type]: id=p_open_wooden
-#: data/core/terrain.cfg:1191
+#: data/core/terrain.cfg:1457
 msgid "Wooden Open Door"
 msgstr "開いた木の扉"
 
 #. [terrain_type]: id=impassable_overlay
-#: data/core/terrain.cfg:1201
+#: data/core/terrain.cfg:1473
 msgid "Impassable Overlay"
 msgstr "通行不能のオーバーレイ"
 
 #. [terrain_type]: id=unwalkable_overlay
-#: data/core/terrain.cfg:1214
+#: data/core/terrain.cfg:1486
 msgid "Unwalkable Overlay"
 msgstr "歩行不能のオーバーレイ"
 
 #. [terrain_type]: id=void
 #. [terrain_type]: id=off_map
-#. [terrain_type]: id=off_map2
-#: data/core/terrain.cfg:1226 data/core/terrain.cfg:2360
-#: data/core/terrain.cfg:2371
+#: data/core/terrain.cfg:1498 data/core/terrain.cfg:2718
 msgid "Void"
 msgstr "虚無"
 
@@ -817,172 +932,172 @@ msgstr "虚無"
 #. [terrain_type]: id=mermen-village
 #. [terrain_type]: id=village_overlay
 #. [terrain_type]: id=village
-#: data/core/terrain.cfg:1242 data/core/terrain.cfg:1255
-#: data/core/terrain.cfg:1268 data/core/terrain.cfg:1281
-#: data/core/terrain.cfg:1296 data/core/terrain.cfg:1309
-#: data/core/terrain.cfg:1324 data/core/terrain.cfg:1337
-#: data/core/terrain.cfg:1352 data/core/terrain.cfg:1365
-#: data/core/terrain.cfg:1378 data/core/terrain.cfg:1391
-#: data/core/terrain.cfg:1404 data/core/terrain.cfg:1417
-#: data/core/terrain.cfg:1430 data/core/terrain.cfg:1443
-#: data/core/terrain.cfg:1456 data/core/terrain.cfg:1469
-#: data/core/terrain.cfg:1482 data/core/terrain.cfg:1495
-#: data/core/terrain.cfg:1510 data/core/terrain.cfg:1523
-#: data/core/terrain.cfg:1536 data/core/terrain.cfg:1549
-#: data/core/terrain.cfg:1562 data/core/terrain.cfg:1575
-#: data/core/terrain.cfg:1588 data/core/terrain.cfg:1603
-#: data/core/terrain.cfg:1616 data/core/terrain.cfg:1634
-#: data/core/terrain.cfg:2585 data/core/terrain.cfg:2586
+#: data/core/terrain.cfg:1514 data/core/terrain.cfg:1527
+#: data/core/terrain.cfg:1540 data/core/terrain.cfg:1553
+#: data/core/terrain.cfg:1568 data/core/terrain.cfg:1581
+#: data/core/terrain.cfg:1596 data/core/terrain.cfg:1609
+#: data/core/terrain.cfg:1624 data/core/terrain.cfg:1637
+#: data/core/terrain.cfg:1650 data/core/terrain.cfg:1663
+#: data/core/terrain.cfg:1676 data/core/terrain.cfg:1689
+#: data/core/terrain.cfg:1702 data/core/terrain.cfg:1715
+#: data/core/terrain.cfg:1728 data/core/terrain.cfg:1741
+#: data/core/terrain.cfg:1754 data/core/terrain.cfg:1767
+#: data/core/terrain.cfg:1782 data/core/terrain.cfg:1795
+#: data/core/terrain.cfg:1808 data/core/terrain.cfg:1821
+#: data/core/terrain.cfg:1834 data/core/terrain.cfg:1847
+#: data/core/terrain.cfg:1860 data/core/terrain.cfg:1875
+#: data/core/terrain.cfg:1888 data/core/terrain.cfg:1906
+#: data/core/terrain.cfg:2956 data/core/terrain.cfg:2957
 msgid "Village"
 msgstr "村"
 
 #. [terrain_type]: id=desert_village
-#: data/core/terrain.cfg:1243
+#: data/core/terrain.cfg:1515
 msgid "Adobe Village"
 msgstr "煉瓦の村"
 
 #. [terrain_type]: id=desert_village_ruin
-#: data/core/terrain.cfg:1256
+#: data/core/terrain.cfg:1528
 msgid "Ruined Adobe Village"
 msgstr "煉瓦の廃村"
 
 #. [terrain_type]: id=desert_village_tent
-#: data/core/terrain.cfg:1269
+#: data/core/terrain.cfg:1541
 msgid "Desert Tent Village"
 msgstr "砂漠のテントの村"
 
 #. [terrain_type]: id=camp_village
-#: data/core/terrain.cfg:1282
+#: data/core/terrain.cfg:1554
 msgid "Tent Village"
 msgstr "テントの村"
 
 #. [terrain_type]: id=orcish_village
-#: data/core/terrain.cfg:1297
+#: data/core/terrain.cfg:1569
 msgid "Orcish Village"
 msgstr "オークの村"
 
 #. [terrain_type]: id=orcish_snow_village
-#: data/core/terrain.cfg:1310
+#: data/core/terrain.cfg:1582
 msgid "Snowy Orcish Village"
 msgstr "雪のオークの村"
 
 #. [terrain_type]: id=elven_snow_village
-#: data/core/terrain.cfg:1325
+#: data/core/terrain.cfg:1597
 msgid "Snowy Elven Village"
 msgstr "雪のエルフの村"
 
 #. [terrain_type]: id=elven_village
-#: data/core/terrain.cfg:1338
+#: data/core/terrain.cfg:1610
 msgid "Elven Village"
 msgstr "エルフの村"
 
 #. [terrain_type]: id=human_village
-#: data/core/terrain.cfg:1353
+#: data/core/terrain.cfg:1625
 msgid "Cottage"
 msgstr "コテージ"
 
 #. [terrain_type]: id=snow_village
-#: data/core/terrain.cfg:1366
+#: data/core/terrain.cfg:1638
 msgid "Snowy Cottage"
 msgstr "雪のコテージ"
 
 #. [terrain_type]: id=human_village_ruin
-#: data/core/terrain.cfg:1379
+#: data/core/terrain.cfg:1651
 msgid "Ruined Cottage"
 msgstr "廃コテージ"
 
 #. [terrain_type]: id=city_village
-#: data/core/terrain.cfg:1392
+#: data/core/terrain.cfg:1664
 msgid "Human City"
 msgstr "人間の都市"
 
 #. [terrain_type]: id=windmill_village
-#: data/core/terrain.cfg:1405
+#: data/core/terrain.cfg:1677
 msgid "Windmill Village"
 msgstr "風車の村"
 
 #. [terrain_type]: id=city_village_wno
-#: data/core/terrain.cfg:1418
+#: data/core/terrain.cfg:1690
 msgid "Snowy Human City"
 msgstr "雪の人間の都市"
 
 #. [terrain_type]: id=city_village_ruin
-#: data/core/terrain.cfg:1431
+#: data/core/terrain.cfg:1703
 msgid "Ruined Human City"
 msgstr "人間の廃都市"
 
 #. [terrain_type]: id=hill_village
-#: data/core/terrain.cfg:1444
+#: data/core/terrain.cfg:1716
 msgid "Hill Stone Village"
 msgstr "丘の石造りの村"
 
 #. [terrain_type]: id=snow-hill_village
-#: data/core/terrain.cfg:1457
+#: data/core/terrain.cfg:1729
 msgid "Snowy Hill Stone Village"
 msgstr "雪の丘の石造りの村"
 
 #. [terrain_type]: id=hill_village_ruin
-#: data/core/terrain.cfg:1470
+#: data/core/terrain.cfg:1742
 msgid "Ruined Hill Stone Village"
 msgstr "丘の石造りの廃村"
 
 #. [terrain_type]: id=tropical_forest_village
-#: data/core/terrain.cfg:1483
+#: data/core/terrain.cfg:1755
 msgid "Tropical Village"
 msgstr "熱帯の村"
 
 #. [terrain_type]: id=drake_village
-#: data/core/terrain.cfg:1496
+#: data/core/terrain.cfg:1768
 msgid "Drake Village"
 msgstr "ドレークの村"
 
 #. [terrain_type]: id=underground_village
-#: data/core/terrain.cfg:1511
+#: data/core/terrain.cfg:1783
 msgid "Cave Village"
 msgstr "洞窟の村"
 
 #. [terrain_type]: id=dwarven_village
-#: data/core/terrain.cfg:1524
+#: data/core/terrain.cfg:1796
 msgid "Dwarven Village"
 msgstr "ドワーフの村"
 
 #. [terrain_type]: id=hut_village
-#: data/core/terrain.cfg:1537
+#: data/core/terrain.cfg:1809
 msgid "Hut"
 msgstr "小屋"
 
 #. [terrain_type]: id=hut_snow_village
-#: data/core/terrain.cfg:1550
+#: data/core/terrain.cfg:1822
 msgid "Snowy Hut"
 msgstr "雪の小屋"
 
 #. [terrain_type]: id=logcabin_village
-#: data/core/terrain.cfg:1563
+#: data/core/terrain.cfg:1835
 msgid "Log Cabin"
 msgstr "丸太小屋"
 
 #. [terrain_type]: id=logcabin_snow_village
-#: data/core/terrain.cfg:1576
+#: data/core/terrain.cfg:1848
 msgid "Snowy Log Cabin"
 msgstr "雪の丸太小屋"
 
 #. [terrain_type]: id=igloo
-#: data/core/terrain.cfg:1589
+#: data/core/terrain.cfg:1861
 msgid "Igloo"
 msgstr "イグルー"
 
 #. [terrain_type]: id=swamp_village
-#: data/core/terrain.cfg:1604
+#: data/core/terrain.cfg:1876
 msgid "Swamp Village"
 msgstr "沼地の村"
 
 #. [terrain_type]: id=mermen-village
-#: data/core/terrain.cfg:1617
+#: data/core/terrain.cfg:1889
 msgid "Merfolk Village"
 msgstr "マーフォークの村"
 
 #. [terrain_type]: id=mermen-village
-#: data/core/terrain.cfg:1618
+#: data/core/terrain.cfg:1890
 msgid ""
 "<italic>text='Submerged villages'</italic> are the homes of merfolk and nagas. While water-dwelling creatures are at home here, land-dwellers have a hard time navigating and defending these villages. However, like any village, the facilities are available to all creatures which allow units to tend to their wounds. Any unit stationed in a village can heal eight hitpoints each turn, or be cured of poison.\n"
 "\n"
@@ -990,20 +1105,28 @@ msgid ""
 msgstr "<italic>text='水没した村'</italic>はマーフォークの住居です。水棲生物にとっては住居となりますが、陸棲生物にとっては移動・回避が困難になるでしょう。しかし、他の村と同様に傷を癒やす設備はあります。村に滞在しているユニットは毎ターン8回復するか、毒が治療されます。\n\nマーフォークとナーガはこの地形では60%の回避率となりますが、陸棲のユニットは回避率が低下します。"
 
 #. [terrain_type]: id=village_overlay
-#: data/core/terrain.cfg:1635
+#: data/core/terrain.cfg:1907
 msgid "Village Overlay"
 msgstr "村のオーバーレイ"
 
 #. [terrain_type]: id=encampment
+#. [terrain_type]: id=encampment_ruin
 #. [terrain_type]: id=encampment_snow
+#. [terrain_type]: id=troll_encampment
 #. [terrain_type]: id=aquatic_camp
-#: data/core/terrain.cfg:1651 data/core/terrain.cfg:1652
-#: data/core/terrain.cfg:1663 data/core/terrain.cfg:1808
+#: data/core/terrain.cfg:1923 data/core/terrain.cfg:1924
+#: data/core/terrain.cfg:1935 data/core/terrain.cfg:1947
+#: data/core/terrain.cfg:2104 data/core/terrain.cfg:2116
 msgid "Encampment"
 msgstr "野営地"
 
+#. [terrain_type]: id=encampment_ruin
+#: data/core/terrain.cfg:1936
+msgid "Ruined Encampment"
+msgstr "野営地の廃墟"
+
 #. [terrain_type]: id=encampment_snow
-#: data/core/terrain.cfg:1664
+#: data/core/terrain.cfg:1948
 msgid "Snowy Encampment"
 msgstr "雪の野営地"
 
@@ -1012,47 +1135,53 @@ msgstr "雪の野営地"
 #. [terrain_type]: id=human_castle
 #. [terrain_type]: id=snow_castle
 #. [terrain_type]: id=elven_castle
+#. [terrain_type]: id=elven_castle_ruin
 #. [terrain_type]: id=dwarven_castle
 #. [terrain_type]: id=sand_castle
 #. [terrain_type]: id=aquatic_castle
 #. [terrain_type]: id=castle_overlay
 #. [terrain_type]: id=castle
-#: data/core/terrain.cfg:1675 data/core/terrain.cfg:1687
-#: data/core/terrain.cfg:1699 data/core/terrain.cfg:1711
-#: data/core/terrain.cfg:1722 data/core/terrain.cfg:1734
-#: data/core/terrain.cfg:1784 data/core/terrain.cfg:1821
-#: data/core/terrain.cfg:2047 data/core/terrain.cfg:2504
-#: data/core/terrain.cfg:2505
+#: data/core/terrain.cfg:1959 data/core/terrain.cfg:1971
+#: data/core/terrain.cfg:1983 data/core/terrain.cfg:1995
+#: data/core/terrain.cfg:2006 data/core/terrain.cfg:2018
+#: data/core/terrain.cfg:2030 data/core/terrain.cfg:2080
+#: data/core/terrain.cfg:2129 data/core/terrain.cfg:2393
+#: data/core/terrain.cfg:2875 data/core/terrain.cfg:2876
 msgid "Castle"
 msgstr "城"
 
 #. [terrain_type]: id=orcish_fort
-#: data/core/terrain.cfg:1676
+#: data/core/terrain.cfg:1960
 msgid "Orcish Castle"
 msgstr "オークの城"
 
 #. [terrain_type]: id=snow_orcish_fort
-#: data/core/terrain.cfg:1688
+#: data/core/terrain.cfg:1972
 msgid "Snowy Orcish Castle"
 msgstr "雪のオークの城"
 
 #. [terrain_type]: id=human_castle
-#: data/core/terrain.cfg:1700
+#: data/core/terrain.cfg:1984
 msgid "Human Castle"
 msgstr "人間の城"
 
 #. [terrain_type]: id=snow_castle
-#: data/core/terrain.cfg:1712
+#: data/core/terrain.cfg:1996
 msgid "Snowy Human Castle"
 msgstr "雪の人間の城"
 
 #. [terrain_type]: id=elven_castle
-#: data/core/terrain.cfg:1723
+#: data/core/terrain.cfg:2007
 msgid "Elven Castle"
 msgstr "エルフの城"
 
+#. [terrain_type]: id=elven_castle_ruin
+#: data/core/terrain.cfg:2019
+msgid "Elven Castle Ruin"
+msgstr "エルフの荒城"
+
 #. [terrain_type]: id=dwarven_castle
-#: data/core/terrain.cfg:1735
+#: data/core/terrain.cfg:2031
 msgid "Dwarven Castle"
 msgstr "ドワーフの城"
 
@@ -1060,43 +1189,48 @@ msgstr "ドワーフの城"
 #. [terrain_type]: id=sunkenruin
 #. [terrain_type]: id=swampruin
 #. [terrain_type]: id=sand_castle_ruin
-#: data/core/terrain.cfg:1746 data/core/terrain.cfg:1758
-#: data/core/terrain.cfg:1771 data/core/terrain.cfg:1796
+#: data/core/terrain.cfg:2042 data/core/terrain.cfg:2054
+#: data/core/terrain.cfg:2067 data/core/terrain.cfg:2092
 msgid "Ruined Castle"
 msgstr "荒城"
 
 #. [terrain_type]: id=ruin
-#: data/core/terrain.cfg:1747
+#: data/core/terrain.cfg:2043
 msgid "Ruined Human Castle"
 msgstr "人間の荒城"
 
 #. [terrain_type]: id=sunkenruin
-#: data/core/terrain.cfg:1759
+#: data/core/terrain.cfg:2055
 msgid "Sunken Human Ruin"
 msgstr "水没した人間の荒城"
 
 #. [terrain_type]: id=swampruin
-#: data/core/terrain.cfg:1772
+#: data/core/terrain.cfg:2068
 msgid "Swamp Human Ruin"
 msgstr "沼地の人間の荒城"
 
 #. [terrain_type]: id=sand_castle
-#: data/core/terrain.cfg:1785
+#: data/core/terrain.cfg:2081
 msgid "Desert Castle"
 msgstr "砂漠の城"
 
 #. [terrain_type]: id=sand_castle_ruin
-#: data/core/terrain.cfg:1797
+#: data/core/terrain.cfg:2093
 msgid "Ruined Desert Castle"
 msgstr "砂漠の荒城"
 
+#. [terrain_type]: id=troll_encampment
+#: data/core/terrain.cfg:2105
+msgid "Troll Encampment"
+msgstr "トロルの野営地"
+
 #. [terrain_type]: id=aquatic_camp
-#: data/core/terrain.cfg:1809
+#: data/core/terrain.cfg:2117
 msgid "Aquatic Encampment"
 msgstr "水の野営地"
 
 #. [terrain_type]: id=aquatic_castle
-#: data/core/terrain.cfg:1822
+#: data/core/terrain.cfg:2130
 msgid "Aquatic Castle"
 msgstr "水の城"
 
@@ -1104,18 +1238,25 @@ msgstr "水の城"
 #. [terrain_type]: id=encampment_keep_tall
 #. [terrain_type]: id=encampment_snow_keep
 #. [terrain_type]: id=merman_campkeep
-#: data/core/terrain.cfg:1838 data/core/terrain.cfg:1850
-#: data/core/terrain.cfg:1863 data/core/terrain.cfg:2019
+#. [terrain_type]: id=troll_campkeep
+#: data/core/terrain.cfg:2146 data/core/terrain.cfg:2170
+#: data/core/terrain.cfg:2183 data/core/terrain.cfg:2352
+#: data/core/terrain.cfg:2365
 msgid "Encampment Keep"
 msgstr "野営地の主塔"
 
+#. [terrain_type]: id=encampment_ruin_keep
+#: data/core/terrain.cfg:2158
+msgid "Ruined Encampment Keep"
+msgstr "野営地の主塔の廃墟"
+
 #. [terrain_type]: id=encampment_keep_tall
-#: data/core/terrain.cfg:1851
+#: data/core/terrain.cfg:2171
 msgid "Tall Encampment Keep"
 msgstr "野営地の高主塔"
 
 #. [terrain_type]: id=encampment_snow_keep
-#: data/core/terrain.cfg:1864
+#: data/core/terrain.cfg:2184
 msgid "Snowy Encampment Keep"
 msgstr "雪の野営地の主塔"
 
@@ -1124,45 +1265,51 @@ msgstr "雪の野営地の主塔"
 #. [terrain_type]: id=human_keep
 #. [terrain_type]: id=snow_keep
 #. [terrain_type]: id=elven_keep
+#. [terrain_type]: id=elven_keep_ruin
 #. [terrain_type]: id=dwarven_keep
 #. [terrain_type]: id=desert_keep
 #. [terrain_type]: id=merman_castlekeep
 #. [terrain_type]: id=keep_overlay
-#: data/core/terrain.cfg:1876 data/core/terrain.cfg:1889
-#: data/core/terrain.cfg:1902 data/core/terrain.cfg:1915
-#: data/core/terrain.cfg:1928 data/core/terrain.cfg:1941
-#: data/core/terrain.cfg:1993 data/core/terrain.cfg:2032
-#: data/core/terrain.cfg:2060
+#: data/core/terrain.cfg:2196 data/core/terrain.cfg:2209
+#: data/core/terrain.cfg:2222 data/core/terrain.cfg:2235
+#: data/core/terrain.cfg:2248 data/core/terrain.cfg:2261
+#: data/core/terrain.cfg:2274 data/core/terrain.cfg:2326
+#: data/core/terrain.cfg:2378 data/core/terrain.cfg:2406
 msgid "Keep"
 msgstr "主塔"
 
 #. [terrain_type]: id=orcish_keep
-#: data/core/terrain.cfg:1877
+#: data/core/terrain.cfg:2197
 msgid "Orcish Keep"
 msgstr "オークの主塔"
 
 #. [terrain_type]: id=snow_orcish_keep
-#: data/core/terrain.cfg:1890
+#: data/core/terrain.cfg:2210
 msgid "Snowy Orcish Keep"
 msgstr "雪のオークの主塔"
 
 #. [terrain_type]: id=human_keep
-#: data/core/terrain.cfg:1903
+#: data/core/terrain.cfg:2223
 msgid "Human Castle Keep"
 msgstr "人間の城の主塔"
 
 #. [terrain_type]: id=snow_keep
-#: data/core/terrain.cfg:1916
+#: data/core/terrain.cfg:2236
 msgid "Snowy Human Castle Keep"
 msgstr "雪の人間の城の主塔"
 
 #. [terrain_type]: id=elven_keep
-#: data/core/terrain.cfg:1929
+#: data/core/terrain.cfg:2249
 msgid "Elven Castle Keep"
 msgstr "エルフの城の主塔"
 
+#. [terrain_type]: id=elven_keep_ruin
+#: data/core/terrain.cfg:2262
+msgid "Elven Keep Ruin"
+msgstr "エルフの廃墟の主塔"
+
 #. [terrain_type]: id=dwarven_keep
-#: data/core/terrain.cfg:1942
+#: data/core/terrain.cfg:2275
 msgid "Dwarven Castle Keep"
 msgstr "ドワーフの城の主塔"
 
@@ -1170,53 +1317,58 @@ msgstr "ドワーフの城の主塔"
 #. [terrain_type]: id=sunken_keep
 #. [terrain_type]: id=swamp_keep
 #. [terrain_type]: id=desert_keep_ruined
-#: data/core/terrain.cfg:1954 data/core/terrain.cfg:1967
-#: data/core/terrain.cfg:1980 data/core/terrain.cfg:2006
+#: data/core/terrain.cfg:2287 data/core/terrain.cfg:2300
+#: data/core/terrain.cfg:2313 data/core/terrain.cfg:2339
 msgid "Ruined Keep"
 msgstr "廃墟の主塔"
 
 #. [terrain_type]: id=ruined_keep
-#: data/core/terrain.cfg:1955
+#: data/core/terrain.cfg:2288
 msgid "Ruined Human Castle Keep"
 msgstr "人間の荒城の主塔"
 
 #. [terrain_type]: id=sunken_keep
-#: data/core/terrain.cfg:1968
+#: data/core/terrain.cfg:2301
 msgid "Sunken Human Castle Keep"
 msgstr "水没した人間の荒城の主塔"
 
 #. [terrain_type]: id=swamp_keep
-#: data/core/terrain.cfg:1981
+#: data/core/terrain.cfg:2314
 msgid "Swamp Human Castle Keep"
 msgstr "沼地の人間の荒城の主塔"
 
 #. [terrain_type]: id=desert_keep
-#: data/core/terrain.cfg:1994
+#: data/core/terrain.cfg:2327
 msgid "Desert Keep"
 msgstr "砂漠の主塔"
 
 #. [terrain_type]: id=desert_keep_ruined
-#: data/core/terrain.cfg:2007
+#: data/core/terrain.cfg:2340
 msgid "Ruined Desert Keep"
 msgstr "砂漠の廃墟の主塔"
 
 #. [terrain_type]: id=merman_campkeep
-#: data/core/terrain.cfg:2020
+#: data/core/terrain.cfg:2353
 msgid "Aquatic Encampment Keep"
 msgstr "水の野営地の主塔"
 
+#. [terrain_type]: id=troll_campkeep
+#: data/core/terrain.cfg:2366
+msgid "Troll Encampment Keep"
+msgstr "トロルの野営地の主塔"
+
 #. [terrain_type]: id=merman_castlekeep
-#: data/core/terrain.cfg:2033
+#: data/core/terrain.cfg:2379
 msgid "Aquatic Keep"
 msgstr "水の主塔"
 
 #. [terrain_type]: id=castle_overlay
-#: data/core/terrain.cfg:2048
+#: data/core/terrain.cfg:2394
 msgid "Castle Overlay"
 msgstr "城のオーバーレイ"
 
 #. [terrain_type]: id=keep_overlay
-#: data/core/terrain.cfg:2061
+#: data/core/terrain.cfg:2407
 msgid "Keep Overlay"
 msgstr "主塔のオーバーレイ"
 
@@ -1241,30 +1393,30 @@ msgstr "主塔のオーバーレイ"
 #. [terrain_type]: id=plankbridgediag1
 #. [terrain_type]: id=plankbridgediag2
 #. [terrain_type]: id=plankbridge
-#: data/core/terrain.cfg:2079 data/core/terrain.cfg:2094
-#: data/core/terrain.cfg:2107 data/core/terrain.cfg:2120
-#: data/core/terrain.cfg:2132 data/core/terrain.cfg:2145
-#: data/core/terrain.cfg:2160 data/core/terrain.cfg:2172
-#: data/core/terrain.cfg:2185 data/core/terrain.cfg:2200
-#: data/core/terrain.cfg:2211 data/core/terrain.cfg:2224
-#: data/core/terrain.cfg:2240 data/core/terrain.cfg:2253
-#: data/core/terrain.cfg:2266 data/core/terrain.cfg:2279
-#: data/core/terrain.cfg:2292 data/core/terrain.cfg:2305
-#: data/core/terrain.cfg:2318 data/core/terrain.cfg:2331
-#: data/core/terrain.cfg:2344
+#: data/core/terrain.cfg:2425 data/core/terrain.cfg:2440
+#: data/core/terrain.cfg:2453 data/core/terrain.cfg:2466
+#: data/core/terrain.cfg:2478 data/core/terrain.cfg:2491
+#: data/core/terrain.cfg:2506 data/core/terrain.cfg:2518
+#: data/core/terrain.cfg:2531 data/core/terrain.cfg:2546
+#: data/core/terrain.cfg:2558 data/core/terrain.cfg:2572
+#: data/core/terrain.cfg:2589 data/core/terrain.cfg:2603
+#: data/core/terrain.cfg:2617 data/core/terrain.cfg:2631
+#: data/core/terrain.cfg:2645 data/core/terrain.cfg:2659
+#: data/core/terrain.cfg:2673 data/core/terrain.cfg:2687
+#: data/core/terrain.cfg:2701
 msgid "Bridge"
 msgstr "橋"
 
 #. [terrain_type]: id=bridge
 #. [terrain_type]: id=bridgediag1
 #. [terrain_type]: id=bridgediag2
-#: data/core/terrain.cfg:2080 data/core/terrain.cfg:2095
-#: data/core/terrain.cfg:2108
+#: data/core/terrain.cfg:2426 data/core/terrain.cfg:2441
+#: data/core/terrain.cfg:2454
 msgid "Wooden Bridge"
 msgstr "木の橋"
 
 #. [terrain_type]: id=bridge
-#: data/core/terrain.cfg:2086
+#: data/core/terrain.cfg:2432
 msgid ""
 "To those capable of building one, the ability to lay a <italic>text='bridge'</italic> offers a liberation from the fickle nature of waterways, whose fords come and go with the rise and fall of the waterline. This is to say nothing of the luxury of dry feet, the loss of which is no laughing matter in the cold months of the year.\n"
 "\n"
@@ -1274,82 +1426,87 @@ msgstr "自然の水路は気まぐれであり、浅瀬の喫水線は上下し
 #. [terrain_type]: id=rotbridge
 #. [terrain_type]: id=rotbridgediag1
 #. [terrain_type]: id=rotbridgediag2
-#: data/core/terrain.cfg:2121 data/core/terrain.cfg:2133
-#: data/core/terrain.cfg:2146
+#: data/core/terrain.cfg:2467 data/core/terrain.cfg:2479
+#: data/core/terrain.cfg:2492
 msgid "Rotting Bridge"
 msgstr "朽ちた橋"
 
 #. [terrain_type]: id=stone_bridge
 #. [terrain_type]: id=stone_bridgediag1
 #. [terrain_type]: id=stone_bridgediag2
-#: data/core/terrain.cfg:2161 data/core/terrain.cfg:2173
-#: data/core/terrain.cfg:2186
+#: data/core/terrain.cfg:2507 data/core/terrain.cfg:2519
+#: data/core/terrain.cfg:2532
 msgid "Basic Stone Bridge"
 msgstr "普通の石橋"
 
 #. [terrain_type]: id=bridgechasm
 #. [terrain_type]: id=bridgechasmdiag1
 #. [terrain_type]: id=bridgechasmdiag2
-#: data/core/terrain.cfg:2201 data/core/terrain.cfg:2212
-#: data/core/terrain.cfg:2225
+#: data/core/terrain.cfg:2547 data/core/terrain.cfg:2559
+#: data/core/terrain.cfg:2573
 msgid "Cave Chasm Bridge"
 msgstr "洞窟の裂け目の橋"
 
 #. [terrain_type]: id=hangingbridgediag1
 #. [terrain_type]: id=hangingbridgediag2
 #. [terrain_type]: id=hangingbridge
-#: data/core/terrain.cfg:2241 data/core/terrain.cfg:2254
-#: data/core/terrain.cfg:2267
+#: data/core/terrain.cfg:2590 data/core/terrain.cfg:2604
+#: data/core/terrain.cfg:2618
 msgid "Hanging Bridge"
 msgstr "つり橋"
 
 #. [terrain_type]: id=stonechasmbridgediag1
 #. [terrain_type]: id=stonechasmbridgediag2
 #. [terrain_type]: id=stonechasmbridge
-#: data/core/terrain.cfg:2280 data/core/terrain.cfg:2293
-#: data/core/terrain.cfg:2306
+#: data/core/terrain.cfg:2632 data/core/terrain.cfg:2646
+#: data/core/terrain.cfg:2660
 msgid "Stone Chasm Bridge"
 msgstr "裂け目の石橋"
 
 #. [terrain_type]: id=plankbridgediag1
 #. [terrain_type]: id=plankbridgediag2
 #. [terrain_type]: id=plankbridge
-#: data/core/terrain.cfg:2319 data/core/terrain.cfg:2332
-#: data/core/terrain.cfg:2345
+#: data/core/terrain.cfg:2674 data/core/terrain.cfg:2688
+#: data/core/terrain.cfg:2702
 msgid "Plank Bridge"
 msgstr "板橋"
 
 #. [terrain_type]: id=off_map
-#: data/core/terrain.cfg:2361
+#: data/core/terrain.cfg:2719
 msgid "Off Map"
 msgstr "オフマップ"
 
 #. [terrain_type]: id=off_map2
-#: data/core/terrain.cfg:2372
-msgid "Experimental Fake Map Edge"
-msgstr "試験的な偽のマップ端"
+#: data/core/terrain.cfg:2730
+msgid "Fake Map Border"
+msgstr "フェイクマップボーダー"
 
 #. [terrain_type]: id=shroud
 #. [toggle_button]: id=shroud
 #. [toggle_button]: id=sort_7
-#: data/core/terrain.cfg:2382 data/gui/window/editor_edit_side.cfg:180
+#: data/core/terrain.cfg:2741 data/gui/window/editor_edit_side.cfg:180
 #: data/gui/window/game_stats.cfg:384 data/gui/window/mp_create_game.cfg:388
 msgid "Shroud"
 msgstr "幕"
 
+#. [terrain_type]: id=fake_shroud_overlay
+#: data/core/terrain.cfg:2752
+msgid "Fake Shroud"
+msgstr "フェイクの幕"
+
 #. [terrain_type]: id=fog
 #. [toggle_button]: id=sort_6
-#: data/core/terrain.cfg:2392 data/gui/window/game_stats.cfg:370
+#: data/core/terrain.cfg:2763 data/gui/window/game_stats.cfg:370
 msgid "Fog"
 msgstr "霧"
 
 #. [terrain_type]: id=fungus
-#: data/core/terrain.cfg:2407 data/core/terrain.cfg:2408
+#: data/core/terrain.cfg:2778 data/core/terrain.cfg:2779
 msgid "Fungus"
 msgstr "キノコ"
 
 #. [terrain_type]: id=fungus
-#: data/core/terrain.cfg:2411
+#: data/core/terrain.cfg:2782
 msgid ""
 "<italic>text='Mushroom groves'</italic> are vast underground forests of giant mushrooms,\n"
 "which thrive in the damp darkness. Most units have trouble negotiating the spongy floor of smaller fungi, but they have plenty of cover behind the larger stalks. Mounted units, however, become completely mired and lack proper freedom of movement in combat. Undead units have a natural affinity for decay and function quite well in mushroom forests.\n"
@@ -1358,7 +1515,7 @@ msgid ""
 msgstr "<italic>text='キノコの森'</italic>は巨大なキノコで構成された広大な地下の森であり、\nそれらは湿った暗闇でも生き延びることができます。多くのユニットはふわふわしたキノコの床によって移動に問題が生じますが、その代わりに大きな茎に身を隠すこともできます。しかしながら、騎乗ユニットは完全にはまってしまい、戦闘においては移動の自由を失ってしまいます。アンデッドユニットはもとより腐敗を好んでおり、キノコの森で力を十分に発揮することができます。\n\n多くのユニットはこの地形では50〜60%の回避率となり、騎乗ユニットの場合は20%となります。"
 
 #. [terrain_type]: id=cave
-#: data/core/terrain.cfg:2423
+#: data/core/terrain.cfg:2794
 msgid ""
 "<italic>text='Cave'</italic> terrain represents any underground cavern with enough room for a unit to pass.\n"
 "Most units are wholly unfamiliar with the terrain, and thus are both slowed down and hindered in defense. Dwarves and trolls, who make their homes in caves, both have a relatively easy time navigating this terrain, especially dwarves, who by dint of their small size can navigate many obstacles that other races cannot. Occasionally caves are <ref>dst='terrain_illuminated_cave' text='illuminated'</ref>.\n"
@@ -1369,12 +1526,12 @@ msgid ""
 msgstr "<italic>text='洞窟'</italic>地形はユニットが通れるほどの広さがある地下の洞窟です。\nほとんどのユニットは洞窟に適しておらず、移動は遅く、回避率も低くなります。洞窟を住処とするドワーフとトロルは、比較的楽に洞窟を移動することができます。特にドワーフは、体の小ささを活かして他の種族が通れないような場所を通っていきます。洞窟の中にはときおり、<ref>dst='terrain_illuminated_cave' text='照らされている'</ref>場所があります。\n\n地下世界の一部は地表からの光で照らされていることがあります。その場所では、秩序ユニットには攻撃ボーナスが与えられ、混沌ユニットの攻撃ボーナスは失われます。照らされた洞窟のその他の性質については、通常の洞窟地形と同じです。\n\n洞窟地形ではほとんどのユニットは20〜40%の回避率となりますが、ドワーフは50%となります。"
 
 #. [terrain_type]: id=sand
-#: data/core/terrain.cfg:2436
+#: data/core/terrain.cfg:2807
 msgid "Sands"
 msgstr "砂地"
 
 #. [terrain_type]: id=reef
-#: data/core/terrain.cfg:2453
+#: data/core/terrain.cfg:2824
 msgid ""
 "<italic>text='Coastal reefs'</italic> are shallows formed by stone, coral and sand.\n"
 "This provides most land units with a more steady footing and defensive positions than wading in shallow water normally would and also grants most water-dwelling races an exceptionally high defense.\n"
@@ -1383,7 +1540,7 @@ msgid ""
 msgstr "<italic>text='岩礁'</italic>は石やサンゴ、砂で形作られた浅瀬です。\n岩礁には通常の浅瀬よりも良い足場と身を守る遮蔽物が存在するので、陸上ユニットにとっては浅瀬よりは良い地形です。また、水中に適応した種族ならばさらに高い回避率を得ることができます。\n\nマーマンとナーガは70%の回避率を得ます。"
 
 #. [terrain_type]: id=hills
-#: data/core/terrain.cfg:2467
+#: data/core/terrain.cfg:2838
 msgid ""
 "<italic>text='Hills'</italic> represent any reasonably rough terrain,\n"
 "with enough dips and rises in the ground to provide some cover. Hills are difficult for most troops to navigate. Dwarves, trolls, and orcs have enough familiarity with the terrain that they can pass through it without being slowed down. Cavalry have enough trouble navigating the terrain that any defensive aid lent by cover is negated.\n"
@@ -1392,7 +1549,7 @@ msgid ""
 msgstr "<italic>text='丘'</italic>はでこぼこの地形を表しています。身を隠すのに十分な起伏があり、多くの軍隊にとっては進み辛い地形です。ドワーフとトロル、オークはこの地形に慣れており、移動力が落ちることはありません。騎兵はこの地形を進行するのが困難であり、起伏に身を隠すことも難しいので回避率は上昇しません。\n\n殆どのユニットは50%の回避率となり、騎兵は40%に限られます。ドワーフは60%の回避を楽しむことができるでしょう。"
 
 #. [terrain_type]: id=swamp_water
-#: data/core/terrain.cfg:2482
+#: data/core/terrain.cfg:2853
 msgid ""
 "<italic>text='Swamps'</italic> represent any sort of wetlands.\n"
 "Swamps slow down nearly everyone, and inhibit their ability to defend themselves. An exception to this is any race bodily skilled in navigating water; these receive both full movement and a defensive bonus. Those that make their living in the wetlands are also adept at using this terrain for cover.\n"
@@ -1401,7 +1558,7 @@ msgid ""
 msgstr "<italic>text='沼地'</italic>は湿地を意味しています。\n沼地ではほとんどの者が移動力を削がれ、回避率も制限されます。例外として、水中に適した体を持つ者たちは、その移動力と回避率をフルに発揮できます。湿地で暮らす生物たちも、この地形に適応し身を隠すことができます。\n\nほとんどのユニットは30%の回避率となりますが、マーフォークとナーガ、トカゲは60%の回避率を発揮することができます。"
 
 #. [terrain_type]: id=shallow_water
-#: data/core/terrain.cfg:2495
+#: data/core/terrain.cfg:2866
 msgid ""
 "<italic>text='Shallow water'</italic> represents any body of water deep enough to come up to roughly a man’s waist. This is enough to slow down nearly anyone and leave them wide open to attack. Dwarves, given that the water reaches up almost to their heads, have an extremely hard time of this. The exception is any race whose bodies naturally lend themselves to swimming, for which they receive a considerable defensive bonus and full movement.\n"
 "\n"
@@ -1409,7 +1566,7 @@ msgid ""
 msgstr "<italic>text='浅瀬'</italic>は人間の腰が浸かるほど深い水を表しています。ほとんどの者は動きが鈍くなり、攻撃を受けやすくなります。水はドワーフの頭近くまで達するため、彼らは非常に苦しむことになります。例外として、水中に適合した種族は十分な移動力を発揮し、回避ボーナスを得ることができます。\n\nほとんどのユニットは20〜30%の回避率となりますが、ナーガとマーフォークは60%となります。"
 
 #. [terrain_type]: id=castle
-#: data/core/terrain.cfg:2510
+#: data/core/terrain.cfg:2881
 msgid ""
 "<italic>text='Castles'</italic> are any sort of permanent fortification.\n"
 "Nearly all units receive a considerable bonus to their defense by being stationed in a castle, and most units receive full movement in a castle. Stationing units in a castle represents its defensive capability. Without a unit in each wall hex, an enemy can simply sneak into the castle unchallenged, gaining the same defensive bonus as everyone inside.\n"
@@ -1418,7 +1575,7 @@ msgid ""
 msgstr "<italic>text='城'</italic>は要塞の類いを表してます。\nほとんどのユニットは城の中では高い回避率を得ることができ、移動力をフルに発揮できます。つまり、城の中にいるユニットは守りにおいてはアドバンテージを得ることができます。しかし、すべての城壁のヘクスがユニットで埋められていなければ、敵が侵入する可能性もあります。城の回避ボーナスは中にいるもの全員に与えられるため、注意が必要です。\n\n城内では、ほとんどのユニットは60%の回避率を得るでしょう。"
 
 #. [terrain_type]: id=mountains
-#: data/core/terrain.cfg:2524
+#: data/core/terrain.cfg:2895
 msgid ""
 "<italic>text='Mountains'</italic> are steep enough that units often have to climb over obstacles to move.\n"
 "By this nature, they provide a considerable defensive bonus for most troops, but they also severely impede any passage through them. Most cavalry simply cannot enter mountainous terrain; however, elvish cavalry is an exception to this, as are the goblin wolf riders. Both dwarves and trolls are native to mountainous terrain, and have a very easy time getting around.\n"
@@ -1427,7 +1584,7 @@ msgid ""
 msgstr "<italic>text='山'</italic> はユニットが移動するのが難しいほどの急勾配です。\n多くの兵は回避率は向上しますが、通行するのは困難です。多くの騎兵は山に立ち入ることすらできません。しかしながら、エルフの騎兵とゴブリンのウルフライダーは例外です。ドワーフとトロルのすみかでもあり、彼らは簡単に山を乗り越えることができます。\n\nほとんどのユニットは60%の回避率を得ることができ、ドワーフは70%にもなります。"
 
 #. [terrain_type]: id=deep_water
-#: data/core/terrain.cfg:2536
+#: data/core/terrain.cfg:2907
 msgid ""
 "<italic>text='Deep water'</italic> represents any body of water deep enough to cover a man’s head.\n"
 "Most units cannot enter deep water: it is the domain of units which can either fly, or are exceptionally strong swimmers.\n"
@@ -1436,12 +1593,12 @@ msgid ""
 msgstr "<italic>text='深水'</italic>は人間の頭を覆い隠すほどの深い水を表しています。\nほとんどのユニットは深水に立ち入ることはできませんが、飛行ユニットや泳ぎの達人ならば可能です。\n\nマーマンとナーガは50%の回避率と、十分な移動力を発揮できます。"
 
 #. [terrain_type]: id=flat
-#: data/core/terrain.cfg:2547 data/core/terrain.cfg:2548
+#: data/core/terrain.cfg:2918 data/core/terrain.cfg:2919
 msgid "Flat"
 msgstr "平地"
 
 #. [terrain_type]: id=flat
-#: data/core/terrain.cfg:2549
+#: data/core/terrain.cfg:2920
 msgid ""
 "<italic>text='Grassland'</italic> represents open plains, whether cultivated, cut back for grazing, or wild.\n"
 "Being open ground, grassland is both very easy to move across, but is also difficult to defend oneself in. Typically, those units that perform best on grassland are either cavalry, or very agile units which take advantage of the open space.\n"
@@ -1450,7 +1607,7 @@ msgid ""
 msgstr "<italic>text='草原'</italic>は耕された畑や、放牧地、自然のままの土地などの開けた平地を表します。\n広く平坦なため、草原は簡単に横断することができますが、防御には向いていません。一般に、騎兵や平地を得意とする機敏なユニットは草原で最高のパフォーマンスを発揮します。\n\n多くのユニットは30〜40%の回避率を得ます。"
 
 #. [terrain_type]: id=forest
-#: data/core/terrain.cfg:2562
+#: data/core/terrain.cfg:2933
 msgid ""
 "<italic>text='Forests'</italic> represent any woodland with significant undergrowth, enough to hinder passage. Though they slow nearly everyone down, forests do offer better defense to most units than open ground. Cavalry, however, have so much trouble navigating them that any benefit gained by stealth is negated. Elves are an exception to this general rule for forests. Not only do they possess full movement in forests, but they also gain a considerable defensive bonus. Dwarves are another exception to this rule; though they are able to plow through the forests without much loss of speed, their utter unfamiliarity with the terrain causes them to receive no defensive bonus.\n"
 "\n"
@@ -1458,12 +1615,12 @@ msgid ""
 msgstr "<italic>text='森'</italic>は通行を妨げるほど深いやぶを持つ林地を表しています。森では多くの者の動きが鈍くなりますが、平地よりも良い回避率を得ることができます。しかし、騎兵は移動を阻害され、森に身を隠すことすらできません。ただし、エルフたちは例外です。移動力をフルに発揮できるだけではなく、高い回避率を得ることができます。ドワーフもまた例外であり、ほとんどスピードを落とさずに進める代わりに、森に不慣れなために回避率は上昇しません。\n\nほとんどのユニットは50%の回避率となりますが、騎兵は30%に限られます。一方、エルフは騎兵でさえも60〜70%の回避率となります。ドワーフは一般的に30%となります。"
 
 #. [terrain_type]: id=frozen
-#: data/core/terrain.cfg:2572 data/core/terrain.cfg:2573
+#: data/core/terrain.cfg:2943 data/core/terrain.cfg:2944
 msgid "Frozen"
 msgstr "凍土"
 
 #. [terrain_type]: id=frozen
-#: data/core/terrain.cfg:2575
+#: data/core/terrain.cfg:2946
 msgid ""
 "<italic>text='Frozen'</italic> terrain represents any flat area that is covered by snow or ice.\n"
 "Most units are slowed down on it, and have a harder time defending themselves. Note that swimming units, even those who can breathe underwater, cannot swim underneath ice.\n"
@@ -1472,7 +1629,7 @@ msgid ""
 msgstr "<italic>text='凍土'</italic>地形は雪や氷で覆われた平らな場所を表しています。\n多くのユニットは動きが鈍くなり、回避率も低下します。水中ユニットは、たとえ水中で呼吸できる者であっても、氷の下を泳ぐことはできません。\n\nほとんどのユニットは20〜40%の回避率を得ます。"
 
 #. [terrain_type]: id=village
-#: data/core/terrain.cfg:2588
+#: data/core/terrain.cfg:2959
 msgid ""
 "<italic>text='Villages'</italic> represent any group of buildings, human or otherwise.\n"
 "Almost all units, even cavalry, have an easy time navigating villages, and most units gain a defensive bonus from being stationed in a village. Villages allow units the resources to clean and tend to their wounds, which allows any unit stationed therein to heal eight hitpoints each turn, or to be cured of poison.\n"
@@ -1481,12 +1638,12 @@ msgid ""
 msgstr "<italic>text='村'</italic>は人間などの建物の集落を表しています。\n騎兵を含むほとんど全てのユニットは村の間を簡単に移動でき、多くのユニットは高い回避率を得ることができます。村にはユニットの傷を癒やす資源があり、毎ターンHPを8回復するか解毒することができます。\n\nほとんどのユニットは50〜60%の回避率となり、騎兵は40%となります。"
 
 #. [terrain_type]: id=impassable
-#: data/core/terrain.cfg:2598 data/core/terrain.cfg:2599
+#: data/core/terrain.cfg:2969 data/core/terrain.cfg:2970
 msgid "Impassable"
 msgstr "通行不能"
 
 #. [terrain_type]: id=impassable
-#: data/core/terrain.cfg:2601
+#: data/core/terrain.cfg:2972
 msgid ""
 "Obstacles that not even the most determined traveler may overcome include "
 "solid walls of stone and mountains so tall and steep that they are "
@@ -1496,12 +1653,12 @@ msgid ""
 msgstr "石の絶壁や雲が掛かるほど高い山々などは、どんな旅人であっても越えることはできません。飛行生物でさえも切り立った山の頂点には辿りつけず、獰猛なトロルでさえも厚い石の壁は破壊できません。"
 
 #. [terrain_type]: id=unwalkable
-#: data/core/terrain.cfg:2608 data/core/terrain.cfg:2609
+#: data/core/terrain.cfg:2979 data/core/terrain.cfg:2980
 msgid "Unwalkable"
 msgstr "歩行不能"
 
 #. [terrain_type]: id=unwalkable
-#: data/core/terrain.cfg:2611
+#: data/core/terrain.cfg:2982
 msgid ""
 "<italic>text='Unwalkable terrain'</italic> covers any chasm or gorge which, "
 "as the name implies, cannot be crossed simply by walking. Chasms are noted "
@@ -1510,12 +1667,12 @@ msgid ""
 msgstr "<italic>text='歩行不能地形'</italic>は裂け目や峡谷など、その名の通り徒歩で通行できない場所を示しています。裂け目を渡ろうとすれば何日もかかってしまうでしょう。ゲーム中では、飛行できるユニットだけがこの地形を渡ることができます。"
 
 #. [terrain_type]: id=rails
-#: data/core/terrain.cfg:2618 data/core/terrain.cfg:2619
+#: data/core/terrain.cfg:2989 data/core/terrain.cfg:2990
 msgid "Rails"
 msgstr "レール"
 
 #. [terrain_type]: id=rails
-#: data/core/terrain.cfg:2621
+#: data/core/terrain.cfg:2992
 msgid ""
 "<italic>text='Rails'</italic> are used to transport ore, mostly by dwarves."
 msgstr "<italic>text='レール'</italic>は鉱石を輸送するためのものです。大抵の場合、ドワーフによって利用されています。"
@@ -1525,43 +1682,105 @@ msgstr "<italic>text='レール'</italic>は鉱石を輸送するためのもの
 msgid " (Press '$hotkey' for more information)"
 msgstr "（詳しくは「 $hotkey 」を押してください）"
 
-#. [label]: id=room
-#: data/gui/widget/chatbox.cfg:22
-msgid "Rooms"
-msgstr "部屋"
+#. [toggle_button]: id=sort_0
+#. [toggle_button]: id=sort_name
+#. [label]: id=name
+#. [label]
+#. [toggle_button]: id=sort_1
+#: data/gui/widget/addon_list.cfg:78 data/gui/window/campaign_dialog.cfg:226
+#: data/gui/window/game_load.cfg:157 data/gui/window/mp_server_list.cfg:107
+#: data/gui/window/terrain_layers.cfg:45 data/gui/window/unit_list.cfg:93
+#: data/gui/window/unit_recall.cfg:47
+msgid "Name"
+msgstr "名前"
+
+#. [label]
+#: data/gui/widget/addon_list.cfg:93
+msgid "Version"
+msgstr "バージョン"
+
+#. [toggle_button]: id=sort_1
+#: data/gui/widget/addon_list.cfg:107
+msgid "Author"
+msgstr "作者"
+
+#. [toggle_button]: id=sort_2
+#: data/gui/widget/addon_list.cfg:121
+msgid "Size"
+msgstr "サイズ"
+
+#. [toggle_button]: id=sort_3
+#: data/gui/widget/addon_list.cfg:135
+msgid "Downloads"
+msgstr "ダウンロード数"
+
+#. [toggle_button]: id=sort_4
+#. [toggle_button]: id=sort_1
+#. [toggle_button]: id=sort_0
+#: data/gui/widget/addon_list.cfg:151 data/gui/window/unit_create.cfg:136
+#: data/gui/window/unit_list.cfg:79 data/gui/window/unit_recall.cfg:33
+msgid "Type"
+msgstr "種類"
+
+#. [button]: id=single_install
+#. [button]: id=install
+#: data/gui/widget/addon_list.cfg:366 data/gui/window/addon_manager.cfg:203
+msgid "Install add-on"
+msgstr "アドオンのインストール"
+
+#. [button]: id=single_update
+#. [button]: id=update
+#: data/gui/widget/addon_list.cfg:389 data/gui/window/addon_manager.cfg:225
+msgid "Update add-on"
+msgstr "アドオンのアップデート"
+
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [button]: id=single_publish
+#. [button]: id=publish
+#: data/gui/widget/addon_list.cfg:412 data/gui/window/addon_manager.cfg:270
+#: src/gui/widgets/addon_list.cpp:254
+msgid "Publish add-on"
+msgstr "アドオンの公開"
+
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [button]: id=single_uninstall
+#. [button]: id=uninstall
+#: data/gui/widget/addon_list.cfg:435 data/gui/window/addon_manager.cfg:247
+#: src/gui/dialogs/addon/manager.cpp:800
+msgid "Uninstall add-on"
+msgstr "アドオンのアンインストール"
 
 #. [image]: id=pending_messages
-#: data/gui/widget/chatbox.cfg:53
+#: data/gui/widget/chatbox.cfg:40
 msgid "Messages waiting"
 msgstr "メッセージ待機中"
 
-#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [button]: id=close_window
 #. [button]: id=click_dismiss
-#. [button]: id=ok
 #. [button]: id=cancel
-#: data/gui/widget/chatbox.cfg:64 data/gui/widget/window_default.cfg:106
-#: data/gui/window/addon_description.cfg:550
-#: data/gui/window/addon_filter_options.cfg:420
-#: data/gui/window/chat_log.cfg:210 data/gui/window/end_credits.cfg:146
+#. [button]: id=ok
+#: data/gui/widget/chatbox.cfg:51 data/gui/widget/window_default.cfg:106
+#: data/gui/window/attack_predictions.cfg:304 data/gui/window/chat_log.cfg:199
+#: data/gui/window/end_credits.cfg:146
 #: data/gui/window/game_cache_options.cfg:247
-#: data/gui/window/game_stats.cfg:842 data/gui/window/game_version.cfg:643
+#: data/gui/window/game_stats.cfg:843 data/gui/window/game_version.cfg:645
 #: data/gui/window/gamestate_inspector.cfg:397
 #: data/gui/window/generator_settings.cfg:190
+#: data/gui/window/help_browser.cfg:188
 #: data/gui/window/lobby_player_info.cfg:282
 #: data/gui/window/lua_interpreter.cfg:130 data/gui/window/message.cfg:135
 #: data/gui/window/mp_alerts_options.cfg:249
 #: data/gui/window/preferences.cfg:430
+#: data/gui/window/screenshot_notification.cfg:216
 #: data/gui/window/statistics_dialog.cfg:597
 #: data/gui/window/terrain_layers.cfg:434 data/gui/window/unit_list.cfg:447
-#: src/construct_dialog.cpp:141
 msgid "Close"
 msgstr "閉じる"
 
 #. [button]: id=type_profile
 #: data/gui/widget/unit_preview_pane.cfg:113
-#: data/gui/widget/unit_preview_pane.cfg:249
-#: data/gui/widget/unit_preview_pane.cfg:309
+#: data/gui/widget/unit_preview_pane.cfg:296
+#: data/gui/widget/unit_preview_pane.cfg:356
 msgid "Profile"
 msgstr "プロフィール"
 
@@ -1594,7 +1813,7 @@ msgstr "アドオンの削除"
 #. [button]: id=show_help
 #. [button]: id=help
 #: data/gui/window/addon_connect.cfg:184 data/gui/window/title_screen.cfg:174
-#: src/hotkey/hotkey_command.cpp:246
+#: src/hotkey/hotkey_command.cpp:258
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -1608,489 +1827,400 @@ msgstr "接続"
 #: data/gui/window/addon_connect.cfg:212
 #: data/gui/window/addon_uninstall_list.cfg:174
 #: data/gui/window/advanced_graphics_options.cfg:178
-#: data/gui/window/campaign_dialog.cfg:395
-#: data/gui/window/campaign_difficulty.cfg:252
-#: data/gui/window/core_dialog.cfg:240 data/gui/window/custom_tod.cfg:400
+#: data/gui/window/campaign_dialog.cfg:440
+#: data/gui/window/campaign_difficulty.cfg:259
+#: data/gui/window/core_dialog.cfg:240 data/gui/window/custom_tod.cfg:444
 #: data/gui/window/depcheck_select_new.cfg:165
 #: data/gui/window/edit_label.cfg:153 data/gui/window/edit_text.cfg:130
 #: data/gui/window/editor_edit_label.cfg:315
 #: data/gui/window/editor_edit_scenario.cfg:301
 #: data/gui/window/editor_edit_side.cfg:455
 #: data/gui/window/editor_generate_map.cfg:214
-#: data/gui/window/editor_new_map.cfg:125
+#: data/gui/window/editor_new_map.cfg:126
 #: data/gui/window/editor_resize_map.cfg:284
 #: data/gui/window/editor_set_starting_position.cfg:175
-#: data/gui/window/file_dialog.cfg:453 data/gui/window/folder_create.cfg:133
-#: data/gui/window/game_load.cfg:533 data/gui/window/game_save.cfg:134
+#: data/gui/window/file_dialog.cfg:450 data/gui/window/folder_create.cfg:133
+#: data/gui/window/game_load.cfg:578 data/gui/window/game_save.cfg:134
 #: data/gui/window/label_settings.cfg:149
 #: data/gui/window/language_selection.cfg:162 data/gui/window/logging.cfg:169
-#: data/gui/window/message.cfg:149 data/gui/window/mp_change_control.cfg:160
-#: data/gui/window/mp_cmd_wrapper.cfg:477 data/gui/window/mp_connect.cfg:173
-#: data/gui/window/mp_create_game/default_resolution.cfg:454
-#: data/gui/window/mp_create_game/small_resolution.cfg:369
-#: data/gui/window/mp_create_game/tiny_resolution.cfg:329
+#: data/gui/window/message.cfg:149 data/gui/window/mp_change_control.cfg:216
+#: data/gui/window/mp_connect.cfg:173
+#: data/gui/window/mp_create_game/default_resolution.cfg:461
+#: data/gui/window/mp_create_game/small_resolution.cfg:374
+#: data/gui/window/mp_create_game/tiny_resolution.cfg:334
 #: data/gui/window/mp_faction_select.cfg:391
-#: data/gui/window/mp_join_game.cfg:430
 #: data/gui/window/mp_join_game_password_prompt.cfg:149
 #: data/gui/window/mp_login.cfg:271
 #: data/gui/window/mp_method_selection.cfg:298
-#: data/gui/window/mp_server_list.cfg:231 data/gui/window/mp_staging.cfg:516
+#: data/gui/window/mp_server_list.cfg:231 data/gui/window/mp_staging.cfg:433
 #: data/gui/window/network_transmission.cfg:114
 #: data/gui/window/select_orb_colors.cfg:124
 #: data/gui/window/simple_item_selector.cfg:158
-#: data/gui/window/sp_options_configure.cfg:113
-#: data/gui/window/theme_list.cfg:172 data/gui/window/unit_attack.cfg:233
-#: data/gui/window/unit_create.cfg:304 data/gui/window/unit_recall.cfg:456
-#: data/gui/window/unit_recruit.cfg:231 src/construct_dialog.cpp:135
-#: src/construct_dialog.cpp:138 src/hotkey/hotkey_command.cpp:44
+#: data/gui/window/sp_options_configure.cfg:117
+#: data/gui/window/surrender_quit.cfg:114 data/gui/window/theme_list.cfg:155
+#: data/gui/window/unit_attack.cfg:233 data/gui/window/unit_create.cfg:279
+#: data/gui/window/unit_recall.cfg:430 data/gui/window/unit_recruit.cfg:231
+#: src/hotkey/hotkey_command.cpp:55
 msgid "Cancel"
 msgstr "キャンセル"
 
+#. [label]: id=byline
+#: data/gui/window/addon_manager.cfg:84
+msgid "By:"
+msgstr "作者："
+
+#. [label]: id=version_string
+#: data/gui/window/addon_manager.cfg:120
+msgid "Version:"
+msgstr "バージョン："
+
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [scroll_label]: id=description
+#: data/gui/window/addon_manager.cfg:160
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:586
+msgid "No description available."
+msgstr "解説はありません。"
+
+#. [button]: id=delete
+#: data/gui/window/addon_manager.cfg:284
+msgid "Delete add-on"
+msgstr "アドオンの削除"
+
 #. [label]
-#: data/gui/window/addon_description.cfg:88 data/gui/window/addon_list.cfg:600
+#: data/gui/window/addon_manager.cfg:318 data/gui/window/addon_manager.cfg:732
 msgid "Type:"
 msgstr "種類："
 
 #. [label]
-#: data/gui/window/addon_description.cfg:115
-#: data/gui/window/addon_list.cfg:660
+#: data/gui/window/addon_manager.cfg:344
+msgid "date^Uploaded:"
+msgstr "アップロード時刻："
+
+#. [label]
+#: data/gui/window/addon_manager.cfg:377
 msgid "Status:"
 msgstr "状態："
 
 #. [label]
-#: data/gui/window/addon_description.cfg:146
-msgid "Version:"
-msgstr "ã\83\90ã\83¼ã\82¸ã\83§ã\83³ï¼\9a"
+#: data/gui/window/addon_manager.cfg:407
+msgid "date^Updated:"
+msgstr "ã\82¢ã\83\83ã\83\97ã\83\87ã\83¼ã\83\88æ\99\82å\88»"
 
 #. [label]
-#: data/gui/window/addon_description.cfg:172
-#: data/gui/window/addon_list.cfg:721
+#: data/gui/window/addon_manager.cfg:437
 #: data/gui/window/game_cache_options.cfg:160
-#: data/gui/window/screenshot_notification.cfg:139
+#: data/gui/window/screenshot_notification.cfg:141
 msgid "Size:"
 msgstr "サイズ："
 
 #. [label]
-#: data/gui/window/addon_description.cfg:202
-msgid "Author:"
-msgstr "作者："
-
-#. [label]
-#: data/gui/window/addon_description.cfg:228
-#: data/gui/window/addon_list.cfg:749
+#: data/gui/window/addon_manager.cfg:463
 msgid "Downloads:"
 msgstr "ダウンロード数："
 
 #. [label]
-#: data/gui/window/addon_description.cfg:258
-#: data/gui/window/addon_list.cfg:689
-msgid "date^Last updated:"
-msgstr "最終更新："
+#: data/gui/window/addon_manager.cfg:509
+msgid "Dependencies:"
+msgstr "必要なもの："
 
-#. [label]
-#: data/gui/window/addon_description.cfg:284
-#: data/gui/window/addon_list.cfg:628
-msgid "date^First uploaded:"
-msgstr "初アップロード："
+#. [label]: id=dependencies
+#: data/gui/window/addon_manager.cfg:523
+msgid "addon_dependencies^None"
+msgstr "なし"
 
 #. [label]
-#: data/gui/window/addon_description.cfg:329
-#: data/gui/window/editor_edit_scenario.cfg:140
-msgid "Description:"
-msgstr "解説："
+#: data/gui/window/addon_manager.cfg:543
+msgid "Translations:"
+msgstr "翻訳："
 
-#. [scroll_label]: id=description
-#: data/gui/window/addon_description.cfg:346
-#: data/gui/window/addon_list.cfg:570
-msgid "No description available."
-msgstr "解説はありません。"
+#. [label]: id=translations
+#: data/gui/window/addon_manager.cfg:557
+msgid "translations^None"
+msgstr "なし"
 
 #. [label]
-#: data/gui/window/addon_description.cfg:376
-#: data/gui/window/addon_list.cfg:866
+#: data/gui/window/addon_manager.cfg:575
 msgid "Website:"
 msgstr "ウェブサイト："
 
 #. [label]: id=url_none
-#: data/gui/window/addon_description.cfg:398
-#: data/gui/window/addon_list.cfg:889
+#: data/gui/window/addon_manager.cfg:598
 msgid "url^None"
 msgstr "なし"
 
 #. [button]: id=url_copy
-#: data/gui/window/addon_description.cfg:432
-#: data/gui/window/addon_list.cfg:923
+#: data/gui/window/addon_manager.cfg:633
 msgid "url^Copy"
 msgstr "コピー"
 
 #. [button]: id=url_copy
-#: data/gui/window/addon_description.cfg:433
-#: data/gui/window/addon_list.cfg:924
+#: data/gui/window/addon_manager.cfg:634
 msgid "Copy this URL to clipboard"
 msgstr "URLをクリップボードにコピーします"
 
 #. [button]: id=url_go
-#: data/gui/window/addon_description.cfg:446
-#: data/gui/window/addon_list.cfg:937
+#: data/gui/window/addon_manager.cfg:647
 msgid "url^Go"
 msgstr "アクセス"
 
 #. [button]: id=url_go
-#: data/gui/window/addon_description.cfg:447
-#: data/gui/window/addon_list.cfg:938
+#: data/gui/window/addon_manager.cfg:648
 msgid "Visit this URL with a web browser"
 msgstr "WebブラウザでURLにアクセスします"
 
-#. [label]
-#: data/gui/window/addon_description.cfg:473
-#: data/gui/window/addon_list.cfg:797
-msgid "Dependencies:"
-msgstr "必要なもの："
-
-#. [scroll_label]: id=dependencies
-#: data/gui/window/addon_description.cfg:487
-#: data/gui/window/addon_list.cfg:812
-msgid "addon_dependencies^None"
-msgstr "なし"
+#. [text_box]: id=filter
+#: data/gui/window/addon_manager.cfg:694
+msgid "Filters on addon description, version, type or author."
+msgstr "アドオンの説明、バージョン、種類、作者名で検索を行います。"
 
 #. [label]
-#: data/gui/window/addon_description.cfg:505
-#: data/gui/window/addon_list.cfg:832
-msgid "Translations:"
-msgstr "翻訳："
+#: data/gui/window/addon_manager.cfg:706
+msgid "State:"
+msgstr "状態："
 
-#. [scroll_label]: id=translations
-#: data/gui/window/addon_description.cfg:519
-#: data/gui/window/addon_list.cfg:847
-msgid "translations^None"
-msgstr "なし"
+#. [label]
+#: data/gui/window/addon_manager.cfg:759
+msgid "Order:"
+msgstr "指示："
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:49
-msgid "addons_of_type^Campaigns"
-msgstr "キャンペーン"
+#. [label]
+#: data/gui/window/addon_manager.cfg:845
+#: data/gui/window/addon_manager.cfg:1020
+msgid "Add-ons Manager"
+msgstr "アドオンマネージャー"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:50
-msgid "addons_of_type^MP eras"
-msgstr "MP 時代"
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [button]: id=details_toggle
+#: data/gui/window/addon_manager.cfg:945 src/gui/dialogs/addon/manager.cpp:452
+#: src/gui/dialogs/addon/manager.cpp:639
+msgid "Addon Details"
+msgstr "アドオンの詳細"
+
+#. [button]: id=update_all
+#: data/gui/window/addon_manager.cfg:959
+#: data/gui/window/addon_manager.cfg:1123
+msgid "Update All"
+msgstr "全てアップデート"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:53
-msgid "addons_of_type^Scenarios"
-msgstr "シナリオ"
+#. [button]: id=cancel
+#: data/gui/window/addon_manager.cfg:973
+#: data/gui/window/addon_manager.cfg:1137
+msgid "Exit"
+msgstr "終了"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:54
-msgid "addons_of_type^MP factions"
-msgstr "MP 党派"
+#. [scroll_label]
+#: data/gui/window/addon_uninstall_list.cfg:70
+msgid "Choose the add-ons you want to remove."
+msgstr "削除するアドオンを選んで下さい。"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:57
-msgid "addons_of_type^SP/MP campaigns"
-msgstr "SP/MP キャンペーン"
+#. [button]: id=ok
+#. [button]: id=remove
+#: data/gui/window/addon_uninstall_list.cfg:161
+#: data/gui/window/preferences/05_multiplayer.cfg:289
+msgid "Remove"
+msgstr "削除"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:58
-msgid "addons_of_type^MP campaigns"
-msgstr "MP キャンペーン"
+#: data/gui/window/advanced_graphics_options.cfg:42
+msgid "Nearest Neighbor"
+msgstr "Nearest Neighbor"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:61
-msgid "addons_of_type^Resources"
-msgstr "素材集"
+#: data/gui/window/advanced_graphics_options.cfg:42
+msgid "Nearest Neighbor scaling (fastest)"
+msgstr "Nearest Neighbor scaling（最速）"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:62
-msgid "addons_of_type^MP scenarios"
-msgstr "MP シナリオ"
+#: data/gui/window/advanced_graphics_options.cfg:43
+msgid "xBRZ + linear"
+msgstr "xBRZ + linear"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:65
-msgid "addons_of_type^Cores"
-msgstr "コア"
+#: data/gui/window/advanced_graphics_options.cfg:43
+msgid "xBRZ followed by Bilinear interpolation"
+msgstr "xBRZ followed by Bilinear interpolation"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:66
-msgid "addons_of_type^MP map-packs"
-msgstr "MP マップパック"
+#: data/gui/window/advanced_graphics_options.cfg:44
+msgid "xBRZ + NN"
+msgstr "xBRZ + NN"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:70
-msgid "addons_of_type^Other"
-msgstr "その他"
+#: data/gui/window/advanced_graphics_options.cfg:44
+msgid "xBRZ followed by Nearest Neighbor (recommended)"
+msgstr "xBRZ followed by Nearest Neighbor（推奨）"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:71
-msgid "addons_of_type^MP modifications"
-msgstr "MP Mod"
+#: data/gui/window/advanced_graphics_options.cfg:45
+msgid "Bilinear interpolation scaling"
+msgstr "Bilinear interpolation scaling"
 
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:74
-msgid "addons_of_type^Unknown"
-msgstr "不明"
+#: data/gui/window/advanced_graphics_options.cfg:45
+msgid "Linear"
+msgstr "Linear"
 
 #. [label]
-#: data/gui/window/addon_filter_options.cfg:174
-msgid "Options"
-msgstr "オプション"
+#: data/gui/window/advanced_graphics_options.cfg:91
+msgid "Advanced Graphics Options"
+msgstr "上級グラフィックオプション"
 
 #. [label]
-#: data/gui/window/addon_filter_options.cfg:188
-msgid "Add-ons matching the following criteria will be displayed."
-msgstr "以下の条件にマッチしたアドオンを表示します。"
+#: data/gui/window/advanced_graphics_options.cfg:107
+msgid "Images will be scaled using the following algorithms:"
+msgstr "画像は選択したアルゴリズムを使用して縮小・拡大されます。"
 
-#. [label]
-#: data/gui/window/addon_filter_options.cfg:225
-#: data/gui/window/addon_list.cfg:1065
-msgid "Installation status:"
-msgstr "インストール状況："
+#. [column]
+#: data/gui/window/advanced_graphics_options.cfg:128
+msgid "All units, haloes, border hexes"
+msgstr "全てのユニット、ヘイロー、ボーダーヘクス"
 
-#. [label]
-#: data/gui/window/addon_filter_options.cfg:268
-msgid "Add-on types:"
-msgstr "ã\82¢ã\83\89ã\82ªã\83³ã\81®ç¨®é¡\9eï¼\9a"
+#. [column]
+#: data/gui/window/advanced_graphics_options.cfg:128
+msgid "Scaled to zoom"
+msgstr "ã\82ºã\83¼ã\83 æ\99\82ã\81®æ\8b¡å¤§ã\83»ç¸®å°\8f"
 
-#. [button]: id=toggle_all_displayed_types
-#: data/gui/window/addon_filter_options.cfg:281
-msgid "Toggle All"
-msgstr "ã\81\99ã\81¹ã\81¦å\8f\8d転"
+#. [column]
+#: data/gui/window/advanced_graphics_options.cfg:139
+msgid "Everything else"
+msgstr "ã\81\9dã\81®ä»\96"
 
-#. [label]
-#: data/gui/window/addon_filter_options.cfg:325
-msgid "Add-ons will be sorted as follows when no column is selected:"
-msgstr "列が選択されていない場合、以下の条件でアドオンを並び替えます。"
-
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:355
-msgid "sort^By name"
-msgstr "名前"
-
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:360
-msgid "sort^By last updated"
-msgstr "更新日"
-
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:365
-msgid "sort^By first upload"
-msgstr "初アップロード日"
-
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:381
-msgid "sort^Ascending"
-msgstr "昇順"
-
-#. [row]
-#: data/gui/window/addon_filter_options.cfg:386
-msgid "sort^Descending"
-msgstr "降順"
-
-#. [label]: id=name
-#. [toggle_button]: id=sort_1
-#. [toggle_button]: id=sort_0
-#. [label]
-#: data/gui/window/addon_list.cfg:50 data/gui/window/game_load.cfg:312
-#: data/gui/window/mp_server_list.cfg:107
-#: data/gui/window/terrain_layers.cfg:45 data/gui/window/unit_list.cfg:93
-#: data/gui/window/unit_recall.cfg:47
-msgid "Name"
-msgstr "名前"
-
-#. [label]
-#: data/gui/window/addon_list.cfg:65
-msgid "Version"
-msgstr "バージョン"
-
-#. [toggle_button]: id=sort_1
-#: data/gui/window/addon_list.cfg:79
-msgid "Author"
-msgstr "作者"
-
-#. [toggle_button]: id=sort_2
-#: data/gui/window/addon_list.cfg:93
-msgid "Size"
-msgstr "サイズ"
-
-#. [toggle_button]: id=sort_3
-#: data/gui/window/addon_list.cfg:107
-msgid "Downloads"
-msgstr "ダウンロード数"
-
-#. [toggle_button]: id=sort_1
-#. [toggle_button]: id=sort_0
-#. [toggle_button]: id=sort_4
-#: data/gui/window/addon_list.cfg:121 data/gui/window/unit_create.cfg:161
-#: data/gui/window/unit_list.cfg:79 data/gui/window/unit_recall.cfg:33
-msgid "Type"
-msgstr "種類"
-
-#. [scroll_label]
-#: data/gui/window/addon_uninstall_list.cfg:70
-msgid "Choose the add-ons you want to remove."
-msgstr "削除するアドオンを選んで下さい。"
-
-#. [button]: id=ok
-#. [button]: id=remove
-#: data/gui/window/addon_uninstall_list.cfg:161
-#: data/gui/window/mp_cmd_wrapper.cfg:198
-#: data/gui/window/preferences/05_multiplayer.cfg:317
-msgid "Remove"
-msgstr "削除"
-
-#: data/gui/window/advanced_graphics_options.cfg:42
-msgid "Nearest Neighbor"
-msgstr "Nearest Neighbor"
-
-#: data/gui/window/advanced_graphics_options.cfg:42
-msgid "Nearest Neighbor scaling (fastest)"
-msgstr "Nearest Neighbor scaling（最速）"
-
-#: data/gui/window/advanced_graphics_options.cfg:43
-msgid "xBRZ + linear"
-msgstr "xBRZ + linear"
-
-#: data/gui/window/advanced_graphics_options.cfg:43
-msgid "xBRZ followed by Bilinear interpolation"
-msgstr "xBRZ followed by Bilinear interpolation"
-
-#: data/gui/window/advanced_graphics_options.cfg:44
-msgid "xBRZ + NN"
-msgstr "xBRZ + NN"
-
-#: data/gui/window/advanced_graphics_options.cfg:44
-msgid "xBRZ followed by Nearest Neighbor (recommended)"
-msgstr "xBRZ followed by Nearest Neighbor（推奨）"
-
-#: data/gui/window/advanced_graphics_options.cfg:45
-msgid "Bilinear interpolation scaling"
-msgstr "Bilinear interpolation scaling"
-
-#: data/gui/window/advanced_graphics_options.cfg:45
-msgid "Linear"
-msgstr "Linear"
-
-#. [label]
-#: data/gui/window/advanced_graphics_options.cfg:91
-msgid "Advanced Graphics Options"
-msgstr "上級グラフィックオプション"
-
-#. [label]
-#: data/gui/window/advanced_graphics_options.cfg:107
-msgid "Images will be scaled using the following algorithms:"
-msgstr "画像は選択したアルゴリズムを使用して縮小・拡大されます。"
-
-#. [column]
-#: data/gui/window/advanced_graphics_options.cfg:128
-msgid "All units, haloes, border hexes"
-msgstr "全てのユニット、ヘイロー、ボーダーヘクス"
-
-#. [column]
-#: data/gui/window/advanced_graphics_options.cfg:128
-msgid "Scaled to zoom"
-msgstr "ズーム時の拡大・縮小"
-
-#. [column]
-#: data/gui/window/advanced_graphics_options.cfg:139
-msgid "Everything else"
-msgstr "その他"
-
-#. [column]
-#: data/gui/window/advanced_graphics_options.cfg:139
-msgid "Scaled to hex"
-msgstr "ヘクスの拡大・縮小"
+#. [column]
+#: data/gui/window/advanced_graphics_options.cfg:139
+msgid "Scaled to hex"
+msgstr "ヘクスの拡大・縮小"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [button]: id=ok
 #: data/gui/window/advanced_graphics_options.cfg:165
-#: data/gui/window/campaign_dialog.cfg:381
-#: data/gui/window/campaign_difficulty.cfg:239
-#: data/gui/window/campaign_settings.cfg:322
-#: data/gui/window/core_dialog.cfg:227 data/gui/window/custom_tod.cfg:388
+#: data/gui/window/campaign_dialog.cfg:426
+#: data/gui/window/campaign_difficulty.cfg:246
+#: data/gui/window/core_dialog.cfg:227 data/gui/window/custom_tod.cfg:431
 #: data/gui/window/depcheck_select_new.cfg:151
 #: data/gui/window/edit_label.cfg:139 data/gui/window/edit_text.cfg:116
 #: data/gui/window/editor_edit_label.cfg:301
 #: data/gui/window/editor_edit_scenario.cfg:287
 #: data/gui/window/editor_edit_side.cfg:443
 #: data/gui/window/editor_set_starting_position.cfg:162
-#: data/gui/window/file_dialog.cfg:440 data/gui/window/folder_create.cfg:119
-#: data/gui/window/game_load.cfg:520 data/gui/window/game_save.cfg:120
+#: data/gui/window/file_dialog.cfg:437 data/gui/window/folder_create.cfg:119
+#: data/gui/window/game_load.cfg:565 data/gui/window/game_save.cfg:120
 #: data/gui/window/label_settings.cfg:137
 #: data/gui/window/language_selection.cfg:148 data/gui/window/logging.cfg:159
-#: data/gui/window/mp_change_control.cfg:150
+#: data/gui/window/mp_change_control.cfg:203
 #: data/gui/window/mp_faction_select.cfg:379
 #: data/gui/window/mp_join_game_password_prompt.cfg:136
 #: data/gui/window/mp_login.cfg:243
 #: data/gui/window/mp_method_selection.cfg:284
-#: data/gui/window/screenshot_notification.cfg:200
 #: data/gui/window/select_orb_colors.cfg:113
 #: data/gui/window/simple_item_selector.cfg:145
-#: data/gui/window/sp_options_configure.cfg:101
-#: data/gui/window/theme_list.cfg:159 data/gui/window/unit_advance.cfg:189
-#: data/gui/window/unit_create.cfg:293 data/gui/window/wml_error.cfg:162
-#: data/gui/window/wml_message.cfg:430 src/construct_dialog.cpp:127
-#: src/construct_dialog.cpp:134 src/gui/dialogs/message.cpp:180
-#: src/gui/dialogs/message.cpp:187
+#: data/gui/window/sp_options_configure.cfg:105
+#: data/gui/window/theme_list.cfg:142 data/gui/window/unit_advance.cfg:190
+#: data/gui/window/unit_create.cfg:268 data/gui/window/wml_error.cfg:162
+#: data/gui/window/wml_message.cfg:436 src/gui/dialogs/message.cpp:181
+#: src/gui/dialogs/message.cpp:188
 msgid "OK"
 msgstr "OK"
 
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:82
+msgid "Base damage"
+msgstr "基本ダメージ"
+
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:84
+msgid "Time of day modifier"
+msgstr "時刻の影響"
+
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:85
+msgid "Leadership bonus"
+msgstr "統率ボーナス"
+
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:86
+msgid "Slowed penalty"
+msgstr "遅化によるペナルティ"
+
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:90
+msgid "Total damage"
+msgstr "総ダメージ"
+
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:94
+msgid "Chance to hit"
+msgstr "命中率"
+
+#. [grid]
+#: data/gui/window/attack_predictions.cfg:95
+msgid "Chance of being unscathed"
+msgstr "無傷の可能性"
+
 #. [label]
-#: data/gui/window/campaign_dialog.cfg:51
+#: data/gui/window/attack_predictions.cfg:185
+msgid "Expected Battle Result (HP)"
+msgstr "予想される戦闘結果（HP）"
+
+#. [label]: id=title
+#: data/gui/window/attack_predictions.cfg:249
+msgid "Damage Calculations"
+msgstr "ダメージ計算"
+
+#. [column]
+#: data/gui/window/attack_predictions.cfg:272
+msgid "Attacker"
+msgstr "攻撃側"
+
+#. [column]
+#: data/gui/window/attack_predictions.cfg:282
+msgid "Defender"
+msgstr "防御側"
+
+#. [label]
+#: data/gui/window/campaign_dialog.cfg:174
 msgid "Play a Campaign"
 msgstr "キャンペーンをプレイ"
 
+#. [label]
+#: data/gui/window/campaign_dialog.cfg:214
+msgid "Sort by:"
+msgstr "並び順："
+
+#. [toggle_button]: id=sort_name
+#: data/gui/window/campaign_dialog.cfg:227
+msgid "Sort by full campaign name in alphabetical order"
+msgstr "キャンペーン正式名のアルファベット順"
+
+#. [toggle_button]: id=sort_time
+#: data/gui/window/campaign_dialog.cfg:239
+msgid "Dates"
+msgstr "日付"
+
+#. [toggle_button]: id=sort_time
+#: data/gui/window/campaign_dialog.cfg:240
+msgid "Sort in approximate chronological order of story events"
+msgstr "概ねストーリー上のイベントの順"
+
+#. [label]
+#: data/gui/window/campaign_dialog.cfg:276
+msgid "Modifications"
+msgstr "Mod"
+
 #. [toggle_button]: id=checkbox_deterministic
-#: data/gui/window/campaign_dialog.cfg:364
+#: data/gui/window/campaign_dialog.cfg:409
 msgid "Deterministic mode"
 msgstr "決定論モード"
 
 #. [toggle_button]: id=checkbox_deterministic
-#: data/gui/window/campaign_dialog.cfg:366
+#: data/gui/window/campaign_dialog.cfg:411
 msgid ""
 "Makes the random number generator yield the same results even after "
 "reloading a game"
 msgstr "ゲームを再開した場合でも、乱数生成器が同じ値を出すようになります。"
 
 #. [label]: id=title
-#: data/gui/window/campaign_difficulty.cfg:58
+#: data/gui/window/campaign_difficulty.cfg:63
 msgid "Difficulty"
 msgstr "難易度 "
 
 #. [scroll_label]: id=message
-#: data/gui/window/campaign_difficulty.cfg:78
+#: data/gui/window/campaign_difficulty.cfg:83
 msgid "Select difficulty level:"
 msgstr "難易度選択："
 
 #. [label]
-#: data/gui/window/campaign_settings.cfg:48
-msgid "Advanced Settings"
-msgstr "上級設定"
-
-#. [label]
-#: data/gui/window/campaign_settings.cfg:77
-msgid "Additional dialogs:"
-msgstr "追加のダイアログ："
-
-#. [toggle_button]: id=mp_connect
-#: data/gui/window/campaign_settings.cfg:116
-msgid "Configure sides"
-msgstr "陣営の設定"
-
-#. [label]: id=era_label
-#: data/gui/window/campaign_settings.cfg:157
-#: data/gui/window/lobby_main.cfg:132
-msgid "Era:"
-msgstr "時代："
-
-#. [label]: id=mod_label
-#. [label]: id=mods_label
-#. [label]: id=mods_header
-#: data/gui/window/campaign_settings.cfg:246
-#: data/gui/window/lobby_main.cfg:167 data/gui/window/mp_create_game.cfg:203
-msgid "Modifications:"
-msgstr "Mod："
-
-#. [label]
 #: data/gui/window/chat_log.cfg:36
 msgid "Chat Log"
 msgstr "チャットログ"
@@ -2105,11 +2235,9 @@ msgstr "ページ："
 msgid "Last"
 msgstr "最後"
 
-#. [button]: id=previous_tod
-#. [button]: id=previous_tip
 #. [button]: id=previous_page
-#: data/gui/window/chat_log.cfg:105 data/gui/window/custom_tod.cfg:327
-#: data/gui/window/title_screen.cfg:190
+#. [button]: id=previous_tip
+#: data/gui/window/chat_log.cfg:105 data/gui/window/title_screen.cfg:190
 msgid "Previous"
 msgstr "前"
 
@@ -2118,11 +2246,9 @@ msgstr "前"
 msgid "Previous page"
 msgstr "前のページへ"
 
-#. [button]: id=next_tod
-#. [button]: id=next_tip
 #. [button]: id=next_page
-#: data/gui/window/chat_log.cfg:114 data/gui/window/custom_tod.cfg:352
-#: data/gui/window/title_screen.cfg:205
+#. [button]: id=next_tip
+#: data/gui/window/chat_log.cfg:114 data/gui/window/title_screen.cfg:205
 msgid "Next"
 msgstr "次"
 
@@ -2131,21 +2257,15 @@ msgstr "次"
 msgid "Next page"
 msgstr "次のページへ"
 
-#. [label]
-#: data/gui/window/chat_log.cfg:132 data/gui/window/lobby_main.cfg:466
-#: data/gui/window/mp_create_game.cfg:664
-msgid "Filter:"
-msgstr "フィルター："
-
 #. [button]: id=copy
-#: data/gui/window/chat_log.cfg:196
+#: data/gui/window/chat_log.cfg:185
 #: data/gui/window/gamestate_inspector.cfg:335
 #: data/gui/window/lua_interpreter.cfg:105 data/gui/window/wml_error.cfg:124
 msgid "clipboard^Copy"
 msgstr "コピー"
 
 #. [button]: id=copy
-#: data/gui/window/chat_log.cfg:197 data/gui/window/lua_interpreter.cfg:106
+#: data/gui/window/chat_log.cfg:186 data/gui/window/lua_interpreter.cfg:106
 msgid "Copy this log to clipboard"
 msgstr "ログをクリップボードにコピーします"
 
@@ -2154,86 +2274,110 @@ msgstr "ログをクリップボードにコピーします"
 msgid "Load Core"
 msgstr "コアの読み込み"
 
+#. [button]: id=copy_
+#. [button]: id=copy
+#: data/gui/window/custom_tod.cfg:50
+#: data/gui/window/game_cache_options.cfg:110
+#: data/gui/window/game_version.cfg:46
+#: data/gui/window/screenshot_notification.cfg:33
+msgid "filesystem^Copy"
+msgstr "コピー"
+
+#. [button]: id=copy_
+#. [button]: id=copy
+#: data/gui/window/custom_tod.cfg:51
+#: data/gui/window/game_cache_options.cfg:111
+#: data/gui/window/game_version.cfg:47
+#: data/gui/window/screenshot_notification.cfg:34
+msgid "Copy this path to clipboard"
+msgstr "パスをクリップボードにコピーします"
+
+#. [button]: id=browse_
+#. [button]: id=browse
+#: data/gui/window/custom_tod.cfg:66
+#: data/gui/window/game_cache_options.cfg:126
+#: data/gui/window/game_version.cfg:62
+msgid "filesystem^Browse"
+msgstr "ブラウズ"
+
+#. [button]: id=browse_
+#. [button]: id=browse
+#: data/gui/window/custom_tod.cfg:67
+#: data/gui/window/game_cache_options.cfg:127
+#: data/gui/window/game_version.cfg:63
+msgid "Browse this location using a file manager"
+msgstr "ファイルマネージャでこの場所を開きます"
+
 #. [label]
-#: data/gui/window/custom_tod.cfg:45
-msgid "Custom Time Schedule"
-msgstr "タイムスケジュールの変更"
+#: data/gui/window/custom_tod.cfg:147
+msgid "Edit Time Schedule"
+msgstr "タイムスケジュールの編集"
 
 #. [label]
-#: data/gui/window/custom_tod.cfg:63
+#: data/gui/window/custom_tod.cfg:177
 #: data/gui/window/editor_edit_scenario.cfg:106
 #: data/gui/window/folder_create.cfg:72 data/gui/window/game_save.cfg:72
 #: data/gui/window/game_save_message.cfg:92
 #: data/gui/window/game_save_oos.cfg:90
-#: data/gui/window/screenshot_notification.cfg:118
+#: data/gui/window/screenshot_notification.cfg:120
 msgid "Name:"
 msgstr "名前："
 
 #. [label]
-#: data/gui/window/custom_tod.cfg:97
+#: data/gui/window/custom_tod.cfg:204
 msgid "ID:"
 msgstr "ID："
 
-#. [label]
-#: data/gui/window/custom_tod.cfg:131
-msgid "Metadata:"
-msgstr "メタデータ："
-
-#. [button]: id=image_button
-#. [label]
-#: data/gui/window/custom_tod.cfg:146 data/gui/window/terrain_layers.cfg:33
-msgid "Image"
-msgstr "画像"
+#. [grid]
+#: data/gui/window/custom_tod.cfg:285
+msgid "Image:"
+msgstr "画像："
 
-#. [button]: id=mask_button
-#: data/gui/window/custom_tod.cfg:157
-msgid "Mask"
-msgstr "マスク"
+#. [grid]
+#: data/gui/window/custom_tod.cfg:286
+msgid "Mask:"
+msgstr "マスク："
 
-#. [button]: id=sound_button
-#. [widget]: id=label
-#. [label]
-#: data/gui/window/custom_tod.cfg:168
-#: data/gui/window/mp_alerts_options.cfg:154
-#: data/gui/window/preferences.cfg:346
-msgid "Sound"
-msgstr "サウンド"
+#. [grid]
+#: data/gui/window/custom_tod.cfg:287
+msgid "Sound:"
+msgstr "サウンド："
 
 #. [label]
-#: data/gui/window/custom_tod.cfg:201
+#: data/gui/window/custom_tod.cfg:316
 msgid "Lawful Bonus:"
 msgstr "秩序ボーナス："
 
-#. [label]
-#: data/gui/window/custom_tod.cfg:230
+#. [grid]
+#: data/gui/window/custom_tod.cfg:339
 msgid "Red:"
 msgstr "赤："
 
-#. [label]
-#: data/gui/window/custom_tod.cfg:259
+#. [grid]
+#: data/gui/window/custom_tod.cfg:340
 msgid "Green:"
 msgstr "緑："
 
-#. [label]
-#: data/gui/window/custom_tod.cfg:288
+#. [grid]
+#: data/gui/window/custom_tod.cfg:341
 msgid "Blue:"
 msgstr "青："
 
 #. [button]: id=new
-#: data/gui/window/custom_tod.cfg:364
+#: data/gui/window/custom_tod.cfg:405
 msgid "New ToD"
 msgstr "新しい時刻"
 
 #. [button]: id=delete
-#: data/gui/window/custom_tod.cfg:376
+#: data/gui/window/custom_tod.cfg:418
 msgid "Delete ToD"
 msgstr "時刻の削除"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
 #: data/gui/window/depcheck_confirm_change.cfg:40
-#: src/gui/dialogs/file_dialog.cpp:317 src/gui/dialogs/file_dialog.cpp:741
-#: src/gui/widgets/label.cpp:180
+#: src/gui/dialogs/addon/manager.cpp:773 src/gui/dialogs/file_dialog.cpp:307
+#: src/gui/dialogs/file_dialog.cpp:733 src/gui/widgets/label.cpp:172
 msgid "Confirm"
 msgstr "確認"
 
@@ -2249,8 +2393,7 @@ msgstr "変更を適用しますか？"
 #: data/gui/window/game_save_message.cfg:139
 #: data/gui/window/game_save_oos.cfg:191
 #: data/gui/window/game_save_overwrite.cfg:96
-#: data/gui/window/mp_host_game_prompt.cfg:105 src/construct_dialog.cpp:130
-#: src/gui/dialogs/message.cpp:195
+#: data/gui/window/mp_host_game_prompt.cfg:105 src/gui/dialogs/message.cpp:195
 msgid "Yes"
 msgstr "はい"
 
@@ -2261,8 +2404,7 @@ msgstr "はい"
 #: data/gui/window/game_save_message.cfg:153
 #: data/gui/window/game_save_oos.cfg:205
 #: data/gui/window/game_save_overwrite.cfg:110
-#: data/gui/window/mp_host_game_prompt.cfg:118 src/construct_dialog.cpp:131
-#: src/gui/dialogs/message.cpp:198
+#: data/gui/window/mp_host_game_prompt.cfg:118 src/gui/dialogs/message.cpp:197
 msgid "No"
 msgstr "いいえ"
 
@@ -2332,7 +2474,14 @@ msgid "Identifier:"
 msgstr "ID："
 
 #. [label]
+#: data/gui/window/editor_edit_scenario.cfg:140
+msgid "Description:"
+msgstr "解説："
+
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [label]
 #: data/gui/window/editor_edit_scenario.cfg:170
+#: src/gui/dialogs/multiplayer/lobby.cpp:470
 msgid "Experience modifier:"
 msgstr "必要経験値の変更（％）："
 
@@ -2378,7 +2527,6 @@ msgstr "リーダー無し"
 
 #. [toggle_button]: id=fog
 #: data/gui/window/editor_edit_side.cfg:208
-#: data/gui/window/mp_create_game.cfg:372
 msgid "Fog of war"
 msgstr "霧"
 
@@ -2387,8 +2535,10 @@ msgstr "霧"
 msgid "Hide in status table"
 msgstr "ステータステーブルに表示しない"
 
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
-#: data/gui/window/editor_edit_side.cfg:249 data/gui/window/mp_staging.cfg:309
+#: data/gui/window/editor_edit_side.cfg:249 data/gui/window/mp_staging.cfg:330
+#: src/gui/dialogs/multiplayer/lobby.cpp:471
 msgid "Gold:"
 msgstr "ゴールド："
 
@@ -2398,7 +2548,7 @@ msgid "Gold per village:"
 msgstr "村あたりのゴールド："
 
 #. [label]
-#: data/gui/window/editor_edit_side.cfg:305 data/gui/window/mp_staging.cfg:341
+#: data/gui/window/editor_edit_side.cfg:305 data/gui/window/mp_staging.cfg:362
 msgid "Income:"
 msgstr "収入："
 
@@ -2412,8 +2562,9 @@ msgstr "村あたりの維持費の補助："
 msgid "Controller:"
 msgstr "コントローラー："
 
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [row]
-#: data/gui/window/editor_edit_side.cfg:373
+#: data/gui/window/editor_edit_side.cfg:373 src/gui/dialogs/game_stats.cpp:78
 msgid "controller^Human"
 msgstr "人間"
 
@@ -2450,7 +2601,7 @@ msgstr "なし"
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
 #: data/gui/window/editor_generate_map.cfg:43
-#: src/hotkey/hotkey_command.cpp:212
+#: src/hotkey/hotkey_command.cpp:224
 msgid "Generate Map"
 msgstr "マップ生成"
 
@@ -2462,14 +2613,14 @@ msgstr "マップジェネレーターの選択："
 #. [button]: id=settings
 #. [button]: id=random_map_settings
 #: data/gui/window/editor_generate_map.cfg:128
-#: data/gui/window/mp_create_game.cfg:889
+#: data/gui/window/mp_create_game.cfg:876
 msgid "Settings"
 msgstr "設定"
 
 #. [label]
 #: data/gui/window/editor_generate_map.cfg:161
-msgid "Seed:"
-msgstr "シード："
+msgid "Numerical seed:"
+msgstr "乱数の種："
 
 #. [button]: id=ok
 #: data/gui/window/editor_generate_map.cfg:202
@@ -2477,33 +2628,33 @@ msgid "Generate"
 msgstr "生成"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
-#. [label]
-#: data/gui/window/editor_new_map.cfg:35 src/hotkey/hotkey_command.cpp:140
+#. [label]: id=title
+#: data/gui/window/editor_new_map.cfg:36 src/hotkey/hotkey_command.cpp:152
 msgid "New Map"
 msgstr "新規マップ"
 
 #. [label]
 #. [grid]
-#: data/gui/window/editor_new_map.cfg:54
+#: data/gui/window/editor_new_map.cfg:55
 #: data/gui/window/generator_settings.cfg:107
 msgid "Width:"
 msgstr "幅："
 
 #. [label]
 #. [grid]
-#: data/gui/window/editor_new_map.cfg:81
+#: data/gui/window/editor_new_map.cfg:82
 #: data/gui/window/generator_settings.cfg:109
 msgid "Height:"
 msgstr "高さ："
 
 #. [button]: id=ok
-#: data/gui/window/editor_new_map.cfg:115
+#: data/gui/window/editor_new_map.cfg:116
 msgid "Create"
 msgstr "作成"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
-#: data/gui/window/editor_resize_map.cfg:35 src/hotkey/hotkey_command.cpp:210
+#: data/gui/window/editor_resize_map.cfg:35 src/hotkey/hotkey_command.cpp:222
 msgid "Resize Map"
 msgstr "マップのリサイズ"
 
@@ -2558,34 +2709,34 @@ msgid "↑ ↓ to adjust speed"
 msgstr "↑ ↓：スクロールスピードの調節"
 
 #. [label]
-#: data/gui/window/file_dialog.cfg:105
+#: data/gui/window/file_dialog.cfg:103
 msgid "Places"
 msgstr "ブックマーク"
 
 #. [button]: id=add_bookmark
-#: data/gui/window/file_dialog.cfg:301
+#: data/gui/window/file_dialog.cfg:299
 msgid "Bookmarks the current folder"
 msgstr "現在のフォルダをブックマークに追加します"
 
 #. [button]: id=remove_bookmark
-#: data/gui/window/file_dialog.cfg:314
+#: data/gui/window/file_dialog.cfg:312
 msgid "Removes the current bookmark"
 msgstr "選択中のブックマークを削除します"
 
-#. [button]: id=delete_file
 #. [button]: id=delete
-#: data/gui/window/file_dialog.cfg:341 data/gui/window/game_load.cfg:434
+#. [button]: id=delete_file
+#: data/gui/window/file_dialog.cfg:339 data/gui/window/game_load.cfg:479
 msgid "Delete"
 msgstr "削除"
 
 #. [label]: id=title
 #. [button]: id=new_dir
-#: data/gui/window/file_dialog.cfg:354 data/gui/window/folder_create.cfg:43
+#: data/gui/window/file_dialog.cfg:352 data/gui/window/folder_create.cfg:43
 msgid "New Folder"
 msgstr "新しいフォルダ"
 
 #. [label]
-#: data/gui/window/file_dialog.cfg:393
+#: data/gui/window/file_dialog.cfg:391
 msgid "File:"
 msgstr "ファイル："
 
@@ -2640,9 +2791,10 @@ msgid "Execution trace"
 msgstr "実行トレース"
 
 #. [button]: id=cancel
+#. [button]: id=quit_without_surrender
 #. [grid]
 #: data/gui/window/formula_debugger.cfg:234
-#: data/gui/window/title_screen.cfg:261
+#: data/gui/window/surrender_quit.cfg:99 data/gui/window/title_screen.cfg:261
 msgid "Quit"
 msgstr "終了"
 
@@ -2666,36 +2818,6 @@ msgstr "読み込みを高速化するために、Wesnothはキャンペーン
 msgid "Path:"
 msgstr "パス："
 
-#. [button]: id=copy
-#. [button]: id=copy_
-#: data/gui/window/game_cache_options.cfg:110
-#: data/gui/window/game_version.cfg:46
-#: data/gui/window/screenshot_notification.cfg:33
-msgid "filesystem^Copy"
-msgstr "コピー"
-
-#. [button]: id=copy
-#. [button]: id=copy_
-#: data/gui/window/game_cache_options.cfg:111
-#: data/gui/window/game_version.cfg:47
-#: data/gui/window/screenshot_notification.cfg:34
-msgid "Copy this path to clipboard"
-msgstr "パスをクリップボードにコピーします"
-
-#. [button]: id=browse
-#. [button]: id=browse_
-#: data/gui/window/game_cache_options.cfg:126
-#: data/gui/window/game_version.cfg:62
-msgid "filesystem^Browse"
-msgstr "ブラウズ"
-
-#. [button]: id=browse
-#. [button]: id=browse_
-#: data/gui/window/game_cache_options.cfg:127
-#: data/gui/window/game_version.cfg:63
-msgid "Browse this location using a file manager"
-msgstr "ファイルマネージャでこの場所を開きます"
-
 #. [button]: id=clean
 #: data/gui/window/game_cache_options.cfg:194
 msgid "cache^Clean"
@@ -2733,60 +2855,68 @@ msgstr "本当にこのゲームを削除しますか？"
 msgid "Do not show again"
 msgstr "二度と表示しない"
 
+#. [grid]
+#: data/gui/window/game_load.cfg:92
+msgid "Gold Left:"
+msgstr "所持ゴールド："
+
+#. [grid]
+#: data/gui/window/game_load.cfg:95
+msgid "Active Troops:"
+msgstr "マップ上の自軍ユニット："
+
+#. [grid]
+#: data/gui/window/game_load.cfg:98
+msgid "Reserve Troops:"
+msgstr "召還可能ユニット："
+
+#. [toggle_button]: id=sort_1
+#: data/gui/window/game_load.cfg:171
+msgid "Date"
+msgstr "日付"
+
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=lblTitle
 #. [button]: id=load_game
-#: data/gui/window/game_load.cfg:53 data/gui/window/mp_create_game.cfg:910
-#: src/hotkey/hotkey_command.cpp:72
+#: data/gui/window/game_load.cfg:286 data/gui/window/mp_create_game.cfg:897
+#: src/hotkey/hotkey_command.cpp:83
 msgid "Load Game"
 msgstr "ゲームを再開"
 
-#. [label]
-#. [label]: id=lblFilter
-#: data/gui/window/game_load.cfg:258 data/gui/window/unit_create.cfg:101
-#: data/gui/window/unit_recall.cfg:349
-msgid "Filter"
-msgstr "フィルター"
-
-#. [toggle_button]: id=sort_1
-#: data/gui/window/game_load.cfg:326
-msgid "Date"
-msgstr "日付"
-
 #. [toggle_button]: id=change_difficulty
-#: data/gui/window/game_load.cfg:417
+#: data/gui/window/game_load.cfg:462
 msgid "Change difficulty"
 msgstr "難易度変更"
 
 #. [toggle_button]: id=change_difficulty
-#: data/gui/window/game_load.cfg:418
+#: data/gui/window/game_load.cfg:463
 msgid "Change campaign difficulty before loading"
 msgstr "読み込む前にキャンペーンの難易度を変更します"
 
 #. [toggle_button]: id=show_replay
-#: data/gui/window/game_load.cfg:459
+#: data/gui/window/game_load.cfg:504
 msgid "Show replay"
 msgstr "リプレイを見る"
 
 #. [toggle_button]: id=show_replay
-#: data/gui/window/game_load.cfg:460
+#: data/gui/window/game_load.cfg:505
 msgid "Play the embedded replay from the saved game if applicable"
 msgstr "セーブデータの中のリプレイを再生します"
 
 #. [toggle_button]: id=cancel_orders
-#: data/gui/window/game_load.cfg:479
+#: data/gui/window/game_load.cfg:524
 msgid "Cancel orders"
 msgstr "命令の取り消し"
 
 #. [toggle_button]: id=cancel_orders
-#: data/gui/window/game_load.cfg:480
+#: data/gui/window/game_load.cfg:525
 msgid "Cancel any pending unit movements in the saved game"
 msgstr "セーブデータ中の、まだ未解決のユニットの移動命令を取り消します"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=lblTitle
 #: data/gui/window/game_save.cfg:42 data/gui/window/game_save_message.cfg:42
-#: data/gui/window/game_save_oos.cfg:42 src/hotkey/hotkey_command.cpp:69
+#: data/gui/window/game_save_oos.cfg:42 src/hotkey/hotkey_command.cpp:80
 msgid "Save Game"
 msgstr "ゲームを保存"
 
@@ -2813,7 +2943,7 @@ msgstr "同じ名前のセーブデータが既に存在しています。上書
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [toggle_button]: id=sort_0
 #: data/gui/window/game_stats.cfg:35 data/gui/window/game_stats.cfg:283
-#: src/hotkey/hotkey_command.cpp:54
+#: src/hotkey/hotkey_command.cpp:65
 msgid "Leader"
 msgstr "リーダー"
 
@@ -2824,11 +2954,8 @@ msgstr "チーム"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [toggle_button]: id=sort_2
-#. [image]: id=gold_icon
-#. [label]: id=side_gold
-#: data/gui/window/game_stats.cfg:63 data/gui/window/mp_join_game.cfg:219
-#: data/gui/window/mp_join_game.cfg:232
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:394
+#: data/gui/window/game_stats.cfg:63
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:399
 msgid "Gold"
 msgstr "ゴールド"
 
@@ -2851,15 +2978,15 @@ msgstr "維持費"
 #. [toggle_button]: id=sort_6
 #. [image]: id=income_icon
 #. [label]: id=side_income
-#: data/gui/window/game_stats.cfg:118 data/gui/window/mp_join_game.cfg:250
-#: data/gui/window/mp_join_game.cfg:263
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:400
+#: data/gui/window/game_stats.cfg:118 data/gui/window/mp_join_game.cfg:261
+#: data/gui/window/mp_join_game.cfg:274
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:405
 msgid "Income"
 msgstr "収入"
 
 #. [toggle_button]: id=sort_1
 #. [label]: id=side_title
-#: data/gui/window/game_stats.cfg:297 data/gui/window/mp_change_control.cfg:21
+#: data/gui/window/game_stats.cfg:297 data/gui/window/mp_change_control.cfg:22
 msgid "Side"
 msgstr "陣営"
 
@@ -2893,23 +3020,23 @@ msgstr "村あたりの\n補助"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=title
-#: data/gui/window/game_stats.cfg:704 src/gui/dialogs/game_stats.cpp:257
+#: data/gui/window/game_stats.cfg:705 src/gui/dialogs/game_stats.cpp:255
 msgid "Current Status"
 msgstr "現在の状況"
 
 #. [widget]: id=tab_label
-#: data/gui/window/game_stats.cfg:779
+#: data/gui/window/game_stats.cfg:780
 msgid "Game Stats"
 msgstr "ゲームの状況"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [widget]: id=tab_label
-#: data/gui/window/game_stats.cfg:792 src/gui/dialogs/game_stats.cpp:257
+#: data/gui/window/game_stats.cfg:793 src/gui/dialogs/game_stats.cpp:255
 msgid "Scenario Settings"
 msgstr "シナリオ設定"
 
 #. [button]: id=ok
-#: data/gui/window/game_stats.cfg:831 data/gui/window/unit_list.cfg:436
+#: data/gui/window/game_stats.cfg:832 data/gui/window/unit_list.cfg:436
 msgid "Scroll To"
 msgstr "スクロール"
 
@@ -2980,27 +3107,27 @@ msgid "The Battle for Wesnoth"
 msgstr "The Battle for Wesnoth"
 
 #. [widget]: id=tab_label
-#: data/gui/window/game_version.cfg:526
+#: data/gui/window/game_version.cfg:528
 msgid "Paths"
 msgstr "パス"
 
 #. [widget]: id=tab_label
-#: data/gui/window/game_version.cfg:539
+#: data/gui/window/game_version.cfg:541
 msgid "Libraries"
 msgstr "ライブラリ"
 
 #. [widget]: id=tab_label
-#: data/gui/window/game_version.cfg:552
+#: data/gui/window/game_version.cfg:554
 msgid "Features"
 msgstr "機能"
 
 #. [button]: id=copy_all
-#: data/gui/window/game_version.cfg:627
+#: data/gui/window/game_version.cfg:629
 msgid "page^Copy"
 msgstr "コピー"
 
 #. [button]: id=copy_all
-#: data/gui/window/game_version.cfg:628
+#: data/gui/window/game_version.cfg:630
 msgid "Copy the full report to clipboard"
 msgstr "リポートを全てクリップボードにコピーします"
 
@@ -3030,10 +3157,10 @@ msgstr "マップジェネレーターの設定"
 #. [grid]
 #. [label]
 #: data/gui/window/generator_settings.cfg:105
-#: data/gui/window/mp_create_game.cfg:696
-#: data/gui/window/mp_create_game/default_resolution.cfg:125
-#: data/gui/window/mp_create_game/small_resolution.cfg:142
-#: data/gui/window/mp_create_game/tiny_resolution.cfg:132
+#: data/gui/window/mp_create_game.cfg:682
+#: data/gui/window/mp_create_game/default_resolution.cfg:132
+#: data/gui/window/mp_create_game/small_resolution.cfg:147
+#: data/gui/window/mp_create_game/tiny_resolution.cfg:137
 msgid "Players:"
 msgstr "プレイヤー数："
 
@@ -3072,6 +3199,16 @@ msgstr "城どうしの間に道を設置する"
 msgid "Show Labels"
 msgstr "ラベルを表示する"
 
+#. [label]
+#: data/gui/window/help_browser.cfg:116
+msgid "Battle For Wesnoth Help"
+msgstr "Battle For Wesnoth ヘルプ"
+
+#. [label]
+#: data/gui/window/hotkey_bind.cfg:35
+msgid "Press desired hotkey (Esc cancels)"
+msgstr "希望のホットキーを押して下さい （Escでキャンセル）"
+
 #. [label]: id=title
 #: data/gui/window/label_settings.cfg:42
 msgid "Show or Hide Labels"
@@ -3095,166 +3232,126 @@ msgid "Loading..."
 msgstr "読み込み中..."
 
 #. [label]: id=map
-#: data/gui/window/lobby_main.cfg:59
+#: data/gui/window/lobby_main.cfg:27
 msgid "Games"
 msgstr "ゲーム"
 
-#. [row]
-#: data/gui/window/lobby_main.cfg:215 data/gui/window/mp_create_game.cfg:941
-msgid "Assign sides to players at random"
-msgstr "プレイヤーへの陣営の割り当てがランダムに行われます"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:216
+#. [image]: id=needs_password
+#: data/gui/window/lobby_main.cfg:145
 msgid "Requires a password to join"
 msgstr "参加するにはパスワードが必要です"
 
-#. [row]
-#: data/gui/window/lobby_main.cfg:217
-msgid "Only registered users may join"
-msgstr "登録済みのユーザー限定"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:218
-msgid "Use map settings"
-msgstr "マップ設定を使用します"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:219
-msgid "Reloaded game"
-msgstr "再開されたゲーム"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:220
-msgid "Unknown era"
-msgstr "不明な時代"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:222
-msgid "Gold per village"
-msgstr "村あたりのゴールド"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:224
-msgid "Experience modifier"
-msgstr "必要経験値の変更（％）"
-
-#. [row]
-#: data/gui/window/lobby_main.cfg:226
-msgid "Time limit"
-msgstr "時間制限"
-
 #. [button]: id=join
 #. [button]: id=join_global
-#: data/gui/window/lobby_main.cfg:246 data/gui/window/lobby_main.cfg:596
-#: data/gui/window/lobby_main.cfg:751
+#: data/gui/window/lobby_main.cfg:158 data/gui/window/lobby_main.cfg:520
+#: data/gui/window/lobby_main.cfg:687
 msgid "Join"
 msgstr "参加"
 
 #. [button]: id=observe
 #. [button]: id=observe_global
-#: data/gui/window/lobby_main.cfg:259 data/gui/window/lobby_main.cfg:606
-#: data/gui/window/lobby_main.cfg:762
+#: data/gui/window/lobby_main.cfg:187 data/gui/window/lobby_main.cfg:530
+#: data/gui/window/lobby_main.cfg:699
 msgid "Observe"
 msgstr "観戦"
 
 #. [label]
-#: data/gui/window/lobby_main.cfg:288
+#: data/gui/window/lobby_main.cfg:223
 msgid "Sort players:"
 msgstr "プレイヤーの並び替え："
 
 #. [toggle_button]: id=player_list_sort_relation
-#: data/gui/window/lobby_main.cfg:300
+#: data/gui/window/lobby_main.cfg:236
 msgid "Friends first, ignored people last"
 msgstr "友人を先に、無視対象を後に"
 
 #. [toggle_button]: id=player_list_sort_name
-#: data/gui/window/lobby_main.cfg:312
+#: data/gui/window/lobby_main.cfg:249
 msgid "Alphabetically"
 msgstr "アルファベット順"
 
 #. [toggle_button]: id=filter_with_friends
 #. [widget]: id=tab_label
-#: data/gui/window/lobby_main.cfg:486
-#: data/gui/window/preferences/05_multiplayer.cfg:443
+#: data/gui/window/lobby_main.cfg:419
+#: data/gui/window/preferences/05_multiplayer.cfg:415
 msgid "Friends"
 msgstr "友人"
 
 #. [toggle_button]: id=filter_without_ignored
-#: data/gui/window/lobby_main.cfg:496
+#: data/gui/window/lobby_main.cfg:431
 msgid "No ignored"
 msgstr "無視リストのプレイヤーを除外"
 
 #. [toggle_button]: id=filter_vacant_slots
-#: data/gui/window/lobby_main.cfg:506
+#: data/gui/window/lobby_main.cfg:443
 msgid "Vacant slots"
 msgstr "空きスロット"
 
 #. [toggle_button]: id=filter_invert
-#: data/gui/window/lobby_main.cfg:516
+#: data/gui/window/lobby_main.cfg:454
 msgid "Invert filter"
 msgstr "フィルターを反転"
 
 #. [button]: id=quit
-#: data/gui/window/lobby_main.cfg:536 data/gui/window/lobby_main.cfg:706
+#: data/gui/window/lobby_main.cfg:474 data/gui/window/lobby_main.cfg:637
 msgid "Log Out"
 msgstr "ログアウト"
 
 #. [button]: id=refresh
-#: data/gui/window/lobby_main.cfg:546 data/gui/window/lobby_main.cfg:694
+#: data/gui/window/lobby_main.cfg:484 data/gui/window/lobby_main.cfg:625
 msgid "Refresh"
 msgstr "更新"
 
 #. [button]: id=create
 #. [label]
 #. [button]: id=ok
-#: data/gui/window/lobby_main.cfg:566 data/gui/window/lobby_main.cfg:740
-#: data/gui/window/mp_create_game/default_resolution.cfg:38
-#: data/gui/window/mp_create_game/default_resolution.cfg:439
-#: data/gui/window/mp_create_game/small_resolution.cfg:39
-#: data/gui/window/mp_create_game/small_resolution.cfg:354
-#: data/gui/window/mp_create_game/tiny_resolution.cfg:42
-#: data/gui/window/mp_create_game/tiny_resolution.cfg:315
+#: data/gui/window/lobby_main.cfg:497 data/gui/window/lobby_main.cfg:675
+#: data/gui/window/mp_create_game/default_resolution.cfg:45
+#: data/gui/window/mp_create_game/default_resolution.cfg:446
+#: data/gui/window/mp_create_game/small_resolution.cfg:44
+#: data/gui/window/mp_create_game/small_resolution.cfg:359
+#: data/gui/window/mp_create_game/tiny_resolution.cfg:47
+#: data/gui/window/mp_create_game/tiny_resolution.cfg:320
 msgid "Create Game"
 msgstr "ゲームを作成"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
-#. [label]: id=title
 #. [button]: id=show_preferences
+#. [label]: id=title
 #. [grid]
-#: data/gui/window/lobby_main.cfg:576 data/gui/window/lobby_main.cfg:729
+#: data/gui/window/lobby_main.cfg:507 data/gui/window/lobby_main.cfg:663
 #: data/gui/window/preferences.cfg:212 data/gui/window/title_screen.cfg:259
-#: src/hotkey/hotkey_command.cpp:88
+#: src/hotkey/hotkey_command.cpp:99
 msgid "Preferences"
 msgstr "設定"
 
 #. [option]
-#: data/gui/window/lobby_main.cfg:625 data/gui/window/lobby_main.cfg:776
+#: data/gui/window/lobby_main.cfg:549 data/gui/window/lobby_main.cfg:714
 msgid "Normal Replays"
 msgstr "通常リプレイ"
 
 #. [option]
-#: data/gui/window/lobby_main.cfg:629 data/gui/window/lobby_main.cfg:780
+#: data/gui/window/lobby_main.cfg:553 data/gui/window/lobby_main.cfg:718
 msgid "Quick Replays"
 msgstr "高速リプレイ"
 
 #. [option]
-#: data/gui/window/lobby_main.cfg:630 data/gui/window/lobby_main.cfg:781
+#: data/gui/window/lobby_main.cfg:554 data/gui/window/lobby_main.cfg:719
 msgid "Skip quickly to the active turn when observing"
 msgstr "観戦を始めたとき、現在のターンまで高速でリプレイを行います"
 
 #. [option]
-#: data/gui/window/lobby_main.cfg:634 data/gui/window/lobby_main.cfg:785
+#: data/gui/window/lobby_main.cfg:558 data/gui/window/lobby_main.cfg:723
 msgid "Enter Blindfolded"
 msgstr "目隠しで入る"
 
 #. [option]
-#: data/gui/window/lobby_main.cfg:635 data/gui/window/lobby_main.cfg:786
+#: data/gui/window/lobby_main.cfg:559 data/gui/window/lobby_main.cfg:724
 msgid "Do not show the map until given control of a side"
 msgstr "陣営のコントロールを得るまで、マップを表示しません"
 
 #. [label]
-#: data/gui/window/lobby_main.cfg:682 data/gui/window/lobby_main.cfg:867
+#: data/gui/window/lobby_main.cfg:613 data/gui/window/lobby_main.cfg:833
 msgid "Multiplayer Lobby"
 msgstr "マルチプレイヤーロビー"
 
@@ -3266,14 +3363,14 @@ msgstr "プレイヤー情報："
 #. [button]: id=add_to_friends
 #. [button]: id=add_friend
 #: data/gui/window/lobby_player_info.cfg:94
-#: data/gui/window/preferences/05_multiplayer.cfg:291
+#: data/gui/window/preferences/05_multiplayer.cfg:263
 msgid "Add Friend"
 msgstr "友人に追加"
 
 #. [button]: id=add_to_ignores
 #. [button]: id=add_ignored
 #: data/gui/window/lobby_player_info.cfg:105
-#: data/gui/window/preferences/05_multiplayer.cfg:304
+#: data/gui/window/preferences/05_multiplayer.cfg:276
 msgid "Block"
 msgstr "ブロック"
 
@@ -3309,7 +3406,6 @@ msgstr "ステータスのチェック"
 
 #. [button]: id=kick
 #: data/gui/window/lobby_player_info.cfg:250
-#: data/gui/window/mp_cmd_wrapper.cfg:393
 msgid "Kick"
 msgstr "キック"
 
@@ -3351,6 +3447,13 @@ msgstr "マルチプレイヤーロビー内や、マルチプレイヤーゲー
 msgid "Event"
 msgstr "イベント"
 
+#. [label]
+#. [widget]: id=label
+#: data/gui/window/mp_alerts_options.cfg:154
+#: data/gui/window/preferences.cfg:346
+msgid "Sound"
+msgstr "サウンド"
+
 #. [label]: id=notification_label
 #: data/gui/window/mp_alerts_options.cfg:170
 msgid "Desktop Notification"
@@ -3455,7 +3558,7 @@ msgstr "新しいターンが始まった時"
 #. [button]: id=btn_reset_hotkeys
 #. [button]: id=orb_defaults
 #: data/gui/window/mp_alerts_options.cfg:234
-#: data/gui/window/preferences/02_hotkeys.cfg:269
+#: data/gui/window/preferences/02_hotkeys.cfg:263
 #: data/gui/window/select_orb_colors.cfg:102
 msgid "Defaults"
 msgstr "デフォルト"
@@ -3466,76 +3569,15 @@ msgid "Reset all options to their default values"
 msgstr "全てのオプションをデフォルトの値にリセッ卜します"
 
 #. [label]: id=nick_title
-#: data/gui/window/mp_change_control.cfg:73
+#: data/gui/window/mp_change_control.cfg:75
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. [label]
-#: data/gui/window/mp_change_control.cfg:194
+#: data/gui/window/mp_change_control.cfg:140
 msgid "Change Control"
 msgstr "コントロールの変更"
 
-#. [window]: id=mp_cmd_wrapper
-#: data/gui/window/mp_cmd_wrapper.cfg:8
-msgid "Multiplayer command dialog"
-msgstr "マルチプレイヤーコマンドダイアログ"
-
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:39
-msgid "Messaging"
-msgstr "メッセージング"
-
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:69
-msgid "Message:"
-msgstr "メッセージ："
-
-#. [button]: id=ok
-#: data/gui/window/mp_cmd_wrapper.cfg:99
-msgid "Send"
-msgstr "送信"
-
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:139
-msgid "Friends/Ignored List"
-msgstr "友人/無視リスト"
-
-#. [button]: id=add_friend
-#: data/gui/window/mp_cmd_wrapper.cfg:168
-msgid "Add as Friend"
-msgstr "友人に追加"
-
-#. [button]: id=add_ignore
-#: data/gui/window/mp_cmd_wrapper.cfg:183
-msgid "Add as Ignore"
-msgstr "無視リストに追加"
-
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:249
-msgid "Moderating"
-msgstr "管理"
-
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:279
-msgid "Reason:"
-msgstr "理由："
-
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:329
-msgid "Time:"
-msgstr "時間："
-
-#. [button]: id=status
-#. [label]
-#: data/gui/window/mp_cmd_wrapper.cfg:378 data/gui/window/unit_list.cfg:121
-msgid "Status"
-msgstr "ステータス"
-
-#. [button]: id=ban
-#: data/gui/window/mp_cmd_wrapper.cfg:408
-msgid "Ban"
-msgstr "バン"
-
 #. [label]
 #: data/gui/window/mp_connect.cfg:60 data/gui/window/mp_server_list.cfg:69
 msgid "You will now connect to the multiplayer server."
@@ -3561,6 +3603,13 @@ msgstr "ランダム党派の組み合わせ："
 msgid "Allow for mirror matchups when random factions are chosen."
 msgstr "党派にランダムを選択した際に、ミラーマッチを防止することもできます"
 
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [label]: id=mods_header
+#: data/gui/window/mp_create_game.cfg:203
+#: src/gui/dialogs/multiplayer/lobby.cpp:454
+msgid "Modifications:"
+msgstr "Mod："
+
 #. [toggle_button]: id=use_map_settings
 #: data/gui/window/mp_create_game.cfg:313
 msgid "Use Map Settings"
@@ -3617,6 +3666,11 @@ msgid "The amount of experience a unit needs to advance"
 msgstr "ユニットがレベルアップする際に必要な経験値の量を変更します"
 
 #. [toggle_button]: id=fog
+#: data/gui/window/mp_create_game.cfg:372
+msgid "Fog of War"
+msgstr "戦雲（霧）"
+
+#. [toggle_button]: id=fog
 #: data/gui/window/mp_create_game.cfg:373
 msgid "Enemy units cannot be seen unless they are in range of your units"
 msgstr "自軍のユニットの移動範囲に入るまで、敵ユニットはマップ上に表示されません"
@@ -3628,8 +3682,8 @@ msgstr "自軍ユニットが探索するまで、マップが不明な状態と
 
 #. [toggle_button]: id=random_start_time
 #: data/gui/window/mp_create_game.cfg:405
-msgid "Random start time"
-msgstr "開始時間をランダムにする"
+msgid "Random Start Time"
+msgstr "開始時刻をランダムに"
 
 #. [toggle_button]: id=random_start_time
 #: data/gui/window/mp_create_game.cfg:406
@@ -3687,11 +3741,11 @@ msgid "Time for each attack, recruit, and capture"
 msgstr "攻撃、雇用、村確保を行うごとに追加される持ち時間（秒）です"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
-#. [widget]: id=label
 #. [widget]: id=tab_label
+#. [widget]: id=label
 #: data/gui/window/mp_create_game.cfg:533 data/gui/window/preferences.cfg:291
-#: data/gui/window/preferences/05_multiplayer.cfg:430
-#: src/gui/dialogs/preferences_dialog.cpp:688
+#: data/gui/window/preferences/05_multiplayer.cfg:402
+#: src/gui/dialogs/preferences_dialog.cpp:139
 msgid "General"
 msgstr "一般"
 
@@ -3706,71 +3760,77 @@ msgid "Game Settings"
 msgstr "ゲーム設定"
 
 #. [slider]: id=num_players
-#: data/gui/window/mp_create_game.cfg:715
+#: data/gui/window/mp_create_game.cfg:701
 msgid "Any"
 msgstr "全て"
 
 #. [label]
-#: data/gui/window/mp_create_game.cfg:847
+#: data/gui/window/mp_create_game.cfg:834
 msgid "Random map options: "
 msgstr "ランダムマップオプション："
 
 #. [button]: id=random_map_regenerate
-#: data/gui/window/mp_create_game.cfg:868
+#: data/gui/window/mp_create_game.cfg:855
 msgid "Regenerate"
 msgstr "再生成"
 
-#: data/gui/window/mp_create_game.cfg:941
+#: data/gui/window/mp_create_game.cfg:928
+msgid "Assign sides to players at random"
+msgstr "プレイヤーへの陣営の割り当てがランダムに行われます"
+
+#: data/gui/window/mp_create_game.cfg:928
 msgid "Shuffle Sides"
 msgstr "陣営をシャッフル"
 
-#: data/gui/window/mp_create_game.cfg:945
+#: data/gui/window/mp_create_game.cfg:932
 msgid "Allow users who are not playing to watch the game"
 msgstr "プレイヤー以外のユーザがゲームを観戦することを許可します"
 
-#: data/gui/window/mp_create_game.cfg:945
+#: data/gui/window/mp_create_game.cfg:932
 msgid "Observers"
 msgstr "観戦者"
 
-#: data/gui/window/mp_create_game.cfg:949
+#: data/gui/window/mp_create_game.cfg:936
 msgid "Allow only registered users to join the game"
 msgstr "フォーラムに登録済みのユーザーのみがゲームに参加できるようにします"
 
-#: data/gui/window/mp_create_game.cfg:949
+#: data/gui/window/mp_create_game.cfg:936
 msgid "Registered Users Only"
 msgstr "登録済みユーザー限定"
 
-#: data/gui/window/mp_create_game.cfg:953
+#: data/gui/window/mp_create_game.cfg:940
 msgid "Strict Synchronization"
 msgstr "厳格な同期チェック"
 
-#: data/gui/window/mp_create_game.cfg:953
+#: data/gui/window/mp_create_game.cfg:940
 msgid "Stricter checks for out-of-sync errors"
 msgstr "out-of-sync（同期失敗）エラーを厳格にチェックします"
 
 #. [label]
-#: data/gui/window/mp_create_game.cfg:969
+#: data/gui/window/mp_create_game.cfg:956
 msgid "Name of game:"
 msgstr "ゲーム名："
 
 #. [label]
-#: data/gui/window/mp_create_game.cfg:1001
+#: data/gui/window/mp_create_game.cfg:988
 #: data/gui/window/mp_join_game_password_prompt.cfg:90
 #: data/gui/window/mp_login.cfg:143
 msgid "Password:"
 msgstr "パスワード："
 
 #. [text_box]: id=game_password
-#: data/gui/window/mp_create_game.cfg:1015
+#: data/gui/window/mp_create_game.cfg:1002
 msgid ""
 "Set the password that people wanting to join your game as players must "
 "enter."
 msgstr "このゲームの参加時に必要となるパスワードを設定します。"
 
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
-#: data/gui/window/mp_create_game/default_resolution.cfg:169
-#: data/gui/window/mp_create_game/small_resolution.cfg:172
-#: data/gui/window/mp_create_game/tiny_resolution.cfg:159
+#: data/gui/window/mp_create_game/default_resolution.cfg:176
+#: data/gui/window/mp_create_game/small_resolution.cfg:177
+#: data/gui/window/mp_create_game/tiny_resolution.cfg:164
+#: src/gui/dialogs/multiplayer/lobby.cpp:472
 msgid "Map size:"
 msgstr "マップサイズ："
 
@@ -3781,28 +3841,28 @@ msgstr "リーダー："
 
 #. [label]
 #: data/gui/window/mp_faction_select.cfg:161
-#: data/gui/window/unit_create.cfg:229
+#: data/gui/window/unit_create.cfg:204
 msgid "Gender:"
 msgstr "性別:"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [row]
 #: data/gui/window/mp_faction_select.cfg:167
-#: src/gui/dialogs/multiplayer/faction_select.cpp:141
+#: src/gui/dialogs/multiplayer/faction_select.cpp:151
 msgid "Random"
 msgstr "ランダム"
 
-#. [toggle_button]: id=male_toggle
 #. [row]
+#. [toggle_button]: id=male_toggle
 #: data/gui/window/mp_faction_select.cfg:169
-#: data/gui/window/unit_create.cfg:241
+#: data/gui/window/unit_create.cfg:216
 msgid "Male"
 msgstr "男性"
 
-#. [toggle_button]: id=female_toggle
 #. [row]
+#. [toggle_button]: id=female_toggle
 #: data/gui/window/mp_faction_select.cfg:171
-#: data/gui/window/unit_create.cfg:253
+#: data/gui/window/unit_create.cfg:228
 msgid "Female"
 msgstr "女性"
 
@@ -3837,34 +3897,31 @@ msgid ""
 msgstr "ネットワークゲームを立てるにはローカルサーバーを起動する必要があります。サーバーは全てのユーザが切断するまで、バックグラウンドプロセスとして動作します。ローカルサーバーを起動しますか？"
 
 #. [label]
-#: data/gui/window/mp_join_game.cfg:130 data/gui/window/mp_staging.cfg:141
+#: data/gui/window/mp_join_game.cfg:143 data/gui/window/mp_staging.cfg:157
 msgid "<b>Faction:</b>"
 msgstr "<b>党派：</b>"
 
 #. [label]
-#: data/gui/window/mp_join_game.cfg:162 data/gui/window/mp_staging.cfg:173
+#: data/gui/window/mp_join_game.cfg:175 data/gui/window/mp_staging.cfg:190
 msgid "<b>Gender:</b>"
 msgstr "<b>性別：</b>"
 
-#. [label]
-#: data/gui/window/mp_join_game.cfg:330 data/gui/window/mp_staging.cfg:416
-msgid "Connected Players"
-msgstr "参加中のプレイヤー"
-
-#. [button]: id=ok
-#: data/gui/window/mp_join_game.cfg:419 data/gui/window/mp_staging.cfg:505
-msgid "I’m Ready"
-msgstr "準備OK"
+#. [button]: id=cancel
+#: data/gui/window/mp_join_game.cfg:347
+msgid "Leave"
+msgstr "退室"
 
 #. [label]: id=title
-#: data/gui/window/mp_join_game.cfg:496 data/gui/window/mp_staging.cfg:631
+#: data/gui/window/mp_join_game.cfg:410 data/gui/window/mp_staging.cfg:552
+#: data/gui/window/mp_staging.cfg:737
 msgid "Game Lobby"
 msgstr "ゲームロビー"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=status_label
-#: data/gui/window/mp_join_game.cfg:565 data/gui/window/mp_staging.cfg:700
-#: src/gui/dialogs/multiplayer/mp_staging.cpp:433
+#: data/gui/window/mp_join_game.cfg:479 data/gui/window/mp_staging.cfg:614
+#: data/gui/window/mp_staging.cfg:806
+#: src/gui/dialogs/multiplayer/mp_staging.cpp:463
 msgid "Waiting for players to join..."
 msgstr "プレイヤーの参加を待っています..."
 
@@ -3895,8 +3952,9 @@ msgstr "ログイン："
 
 #. [toggle_button]: id=remember_password
 #: data/gui/window/mp_login.cfg:199
-msgid "Save password to preferences (clear text)"
-msgstr "パスワードを保存する（平文）"
+#: data/gui/window/preferences/05_multiplayer.cfg:68
+msgid "Save password locally (encrypted)"
+msgstr "パスワードを暗号化して保存する"
 
 #. [button]: id=password_reminder
 #: data/gui/window/mp_login.cfg:257
@@ -3904,12 +3962,12 @@ msgid "Password Reminder"
 msgstr "パスワードリマインダ"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
-#. [widget]: id=label
 #. [label]
+#. [widget]: id=label
 #. [grid]
 #: data/gui/window/mp_method_selection.cfg:44
 #: data/gui/window/preferences.cfg:364 data/gui/window/title_screen.cfg:253
-#: src/gui/dialogs/game_load.cpp:319
+#: src/gui/dialogs/game_load.cpp:332
 msgid "Multiplayer"
 msgstr "マルチプレイヤー"
 
@@ -3919,8 +3977,8 @@ msgid ""
 "You may login to the official multiplayer server with your forum username and password.\n"
 "Note that registration is not required to join the server: you need to supply a password only if you wish to use a registered username.\n"
 "\n"
-"The Battle for Wesnoth forum can be found at http://forums.wesnoth.org/"
-msgstr "ã\83\95ã\82©ã\83¼ã\83©ã\83 ã\81®ã\83¦ã\83¼ã\82¶å\90\8dã\81¨ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\82\92使ã\81£ã\81¦å\85¬å¼\8fã\83\9eã\83«ã\83\81ã\83\97ã\83¬ã\82¤ã\83¤ã\83¼ã\82µã\83¼ã\83\90ã\83¼ã\81«ã\83­ã\82°ã\82¤ã\83³ã\81\97ã\81¾ã\81\99ã\80\82ï¼\88å\85¬å¼\8fã\82µã\83¼ã\83\90ã\83¼ã\81«æ\8e¥ç¶\9aã\81\99ã\82\8bå ´å\90\88ã\80\81ã\83¦ã\83¼ã\82¶ç\99»é\8c²ã\81¯å¿\85é \88ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82ã\83\95ã\82©ã\83¼ã\83©ã\83 ã\81«ç\99»é\8c²æ¸\88ã\81¿ã\81®ã\83¦ã\83¼ã\82¶å\90\8dã\82\92使ã\81\86å ´å\90\88ã\81«ã\80\81ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\81\8cå¿\85è¦\81ã\81¨ã\81ªã\82\8aã\81¾ã\81\99ã\80\82ï¼\89\n\nBattle for Wesnothã\83\95ã\82©ã\83¼ã\83©ã\83 ï¼\9ahttp://forums.wesnoth.org/ "
+"The Battle for Wesnoth forum can be found at https://forums.wesnoth.org/"
+msgstr "ã\83\95ã\82©ã\83¼ã\83©ã\83 ã\81§ç\94¨ã\81\84ã\81¦ã\81\84ã\82\8bã\83¦ã\83¼ã\82¶ã\83¼å\90\8dã\81¨ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\82\92ç\94¨ã\81\84ã\81¦ã\83\9eã\83«ã\83\81ã\83\97ã\83¬ã\82¤ã\83¤ã\83¼ã\82µã\83¼ã\83\90ã\83¼ã\81«ã\83­ã\82°ã\82¤ã\83³ã\81\99ã\82\8bã\81\93ã\81¨ã\81\8cã\81§ã\81\8dã\81¾ã\81\99ã\80\82ã\81\9fã\81 ã\81\97ã\80\81ã\82µã\83¼ã\83\90ã\83¼ã\81«å\8f\82å\8a ã\81\99ã\82\8bã\81«ã\81\82ã\81\9fã\81£ã\81¦ç\99»é\8c²ã\81¯ä¸\8dè¦\81ã\81§ã\81\99ã\80\82ç\99»é\8c²æ¸\88ã\81¿ã\81®ã\83¦ã\83¼ã\82¶ã\83¼å\90\8dã\82\92使ç\94¨ã\81\97ã\81\9fã\81\84å ´å\90\88ã\81®ã\81¿ã\80\81ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\82\92å\85¥å\8a\9bã\81\99ã\82\8bå¿\85è¦\81ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\80\82\n\nThe Battle for Wesnoth ã\81®ã\83\95ã\82©ã\83¼ã\83©ã\83 ã\81¯ https://forums.wesnoth.org/ ã\81«ã\81\82ã\82\8aã\81¾ã\81\99ã\80\82"
 
 #. [column]
 #: data/gui/window/mp_method_selection.cfg:183
@@ -3959,10 +4017,40 @@ msgstr "アドレス"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [button]: id=ok
-#: data/gui/window/mp_server_list.cfg:217 src/preferences_display.cpp:154
+#: data/gui/window/mp_server_list.cfg:217 src/preferences/display.cpp:172
 msgid "Select"
 msgstr "選択"
 
+#. [button]: id=select_leader
+#: data/gui/window/mp_staging.cfg:70
+msgid "Select the faction and leader for this side"
+msgstr "陣営の党派とリーダーを選択します"
+
+#. [menu_button]: id=controller
+#: data/gui/window/mp_staging.cfg:245
+msgid "Change the side's controller"
+msgstr "陣営のコントローラを変更します"
+
+#. [menu_button]: id=ai_controller
+#: data/gui/window/mp_staging.cfg:261
+msgid "Change the AI side's behaviour"
+msgstr "AI の挙動を変更します"
+
+#. [menu_button]: id=side_team
+#: data/gui/window/mp_staging.cfg:288
+msgid "Which team this side belongs to"
+msgstr "陣営が属するチームを変更します"
+
+#. [menu_button]: id=side_color
+#: data/gui/window/mp_staging.cfg:304
+msgid "The team color"
+msgstr "チームカラーを選択します"
+
+#. [button]: id=ok
+#: data/gui/window/mp_staging.cfg:422
+msgid "I’m Ready"
+msgstr "準備OK"
+
 #. [widget]: id=label
 #: data/gui/window/preferences.cfg:310
 msgid "Hotkeys"
@@ -4014,149 +4102,154 @@ msgid "Speed:"
 msgstr "速度："
 
 #. [column]
-#: data/gui/window/preferences/01_general.cfg:87
+#: data/gui/window/preferences/01_general.cfg:88
 msgid "Units move and fight speed"
 msgstr "ユニットの移動と戦闘の速度を変更します"
 
 #. [toggle_button]: id=disable_auto_moves
-#: data/gui/window/preferences/01_general.cfg:103
+#: data/gui/window/preferences/01_general.cfg:104
 msgid "Disable automatic moves"
 msgstr "自動移動を無効にする"
 
 #. [toggle_button]: id=disable_auto_moves
-#: data/gui/window/preferences/01_general.cfg:104
+#: data/gui/window/preferences/01_general.cfg:105
 msgid "Do not allow automatic movements at the beginning of a turn"
 msgstr "ターン開始時の自動移動を無効にします"
 
 #. [toggle_button]: id=show_turn_dialog
-#: data/gui/window/preferences/01_general.cfg:117
+#: data/gui/window/preferences/01_general.cfg:118
 msgid "Turn dialog"
 msgstr "ターンダイアログを表示する"
 
 #. [toggle_button]: id=show_turn_dialog
-#: data/gui/window/preferences/01_general.cfg:118
+#: data/gui/window/preferences/01_general.cfg:119
 msgid "Display a dialog at the beginning of your turn"
 msgstr "プレイヤーのターン開始時にダイアログを表示して知らせます"
 
 #. [toggle_button]: id=whiteboard_on_start
-#: data/gui/window/preferences/01_general.cfg:131
+#: data/gui/window/preferences/01_general.cfg:132
 msgid "Enable planning mode on start"
 msgstr "開始時に計画モードを有効にする"
 
 #. [toggle_button]: id=whiteboard_on_start
-#: data/gui/window/preferences/01_general.cfg:132
+#: data/gui/window/preferences/01_general.cfg:133
 msgid "Activates Planning Mode on game start"
 msgstr "計画モードをゲーム開始時に有効にします"
 
 #. [toggle_button]: id=whiteboard_hide_allies
-#: data/gui/window/preferences/01_general.cfg:145
+#: data/gui/window/preferences/01_general.cfg:146
 msgid "Hide allies’ plans by default"
 msgstr "同盟軍の計画を非表示にする"
 
 #. [toggle_button]: id=whiteboard_hide_allies
-#: data/gui/window/preferences/01_general.cfg:146
+#: data/gui/window/preferences/01_general.cfg:147
 msgid "Hide allies’ Planning Mode plans in multiplayer games"
 msgstr "マルチプレイヤーゲームで同盟軍が計画モードを使用している時、その計画を非表示にします"
 
 #. [toggle_button]: id=interrupt_move_when_ally_sighted
-#: data/gui/window/preferences/01_general.cfg:159
+#: data/gui/window/preferences/01_general.cfg:160
 msgid "Interrupt move when an ally is sighted"
 msgstr "同盟軍を見つけた時、移動を中断する"
 
 #. [toggle_button]: id=interrupt_move_when_ally_sighted
-#: data/gui/window/preferences/01_general.cfg:160
+#: data/gui/window/preferences/01_general.cfg:161
 msgid "Sighting an allied unit interrupts your unit’s movement"
 msgstr "同盟軍ユニットを見つけた時に、ユニットの移動を中断します"
 
 #. [toggle_button]: id=save_replays
-#: data/gui/window/preferences/01_general.cfg:175
+#: data/gui/window/preferences/01_general.cfg:176
 msgid "Save replays at the end of scenarios"
 msgstr "シナリオ終了時にリプレイを保存する"
 
 #. [toggle_button]: id=save_replays
-#: data/gui/window/preferences/01_general.cfg:176
+#: data/gui/window/preferences/01_general.cfg:177
 msgid ""
 "Save replays of games on victory in all modes and defeat in multiplayer"
 msgstr "全てのモードでの勝利時と、マルチプレイヤーモードでの敗北時にリプレイを保存します"
 
 #. [toggle_button]: id=delete_saves
-#: data/gui/window/preferences/01_general.cfg:189
+#: data/gui/window/preferences/01_general.cfg:190
 msgid "Delete auto-saves at the end of scenarios"
 msgstr "シナリオ終了時に自動保存を削除する"
 
 #. [toggle_button]: id=delete_saves
-#: data/gui/window/preferences/01_general.cfg:190
+#: data/gui/window/preferences/01_general.cfg:191
 msgid ""
 "Delete previous auto-saves on victory in all modes and defeat in multiplayer"
 msgstr "全てのモードでの勝利時とマルチプレイヤーモードでの敗北時に、以前の自動保存を削除します"
 
 #. [column]
-#: data/gui/window/preferences/01_general.cfg:200
+#: data/gui/window/preferences/01_general.cfg:201
 msgid "Maximum auto-saves:"
 msgstr "自動保存の最大数："
 
 #. [column]
-#: data/gui/window/preferences/01_general.cfg:204
+#: data/gui/window/preferences/01_general.cfg:205
 msgid "Set maximum number of automatic saves to be retained"
 msgstr "自動保存の最大数を設定します"
 
 #. [button]: id=cachemg
-#: data/gui/window/preferences/01_general.cfg:220
+#: data/gui/window/preferences/01_general.cfg:221
 msgid "Cache"
 msgstr "キャッシュ"
 
 #. [button]: id=cachemg
-#: data/gui/window/preferences/01_general.cfg:221
+#: data/gui/window/preferences/01_general.cfg:222
 msgid "Manage the game WML cache"
 msgstr "WMLキャッシュを管理します"
 
+#. [label]
+#: data/gui/window/preferences/02_hotkeys.cfg:25
+msgid "Categories:"
+msgstr "カテゴリ："
+
 #. [toggle_button]: id=sort_0
-#: data/gui/window/preferences/02_hotkeys.cfg:87
+#: data/gui/window/preferences/02_hotkeys.cfg:81
 msgid "Action"
 msgstr "動作"
 
 #. [toggle_button]: id=sort_1
-#: data/gui/window/preferences/02_hotkeys.cfg:99
+#: data/gui/window/preferences/02_hotkeys.cfg:93
 msgid "Hotkey"
 msgstr "ホットキー"
 
 #. [toggle_button]: id=sort_2
-#: data/gui/window/preferences/02_hotkeys.cfg:110
+#: data/gui/window/preferences/02_hotkeys.cfg:104
 msgid "game_hotkeys^G"
 msgstr "ゲ"
 
 #. [toggle_button]: id=sort_2
-#: data/gui/window/preferences/02_hotkeys.cfg:111
+#: data/gui/window/preferences/02_hotkeys.cfg:105
 msgid "Available in game"
 msgstr "ゲーム中"
 
 #. [toggle_button]: id=sort_3
-#: data/gui/window/preferences/02_hotkeys.cfg:122
+#: data/gui/window/preferences/02_hotkeys.cfg:116
 msgid "editor_hotkeys^E"
 msgstr "エ"
 
 #. [toggle_button]: id=sort_3
-#: data/gui/window/preferences/02_hotkeys.cfg:123
+#: data/gui/window/preferences/02_hotkeys.cfg:117
 msgid "Available in editor"
 msgstr "エディタ"
 
 #. [toggle_button]: id=sort_4
-#: data/gui/window/preferences/02_hotkeys.cfg:134
+#: data/gui/window/preferences/02_hotkeys.cfg:128
 msgid "titlescreen_hotkeys^T"
 msgstr "タ"
 
 #. [toggle_button]: id=sort_4
-#: data/gui/window/preferences/02_hotkeys.cfg:135
+#: data/gui/window/preferences/02_hotkeys.cfg:129
 msgid "Available at titlescreen"
 msgstr "タイトルスクリーン"
 
 #. [button]: id=btn_add_hotkey
-#: data/gui/window/preferences/02_hotkeys.cfg:247
+#: data/gui/window/preferences/02_hotkeys.cfg:241
 msgid "Add Hotkey"
 msgstr "ホットキーの追加"
 
 #. [button]: id=btn_clear_hotkey
-#: data/gui/window/preferences/02_hotkeys.cfg:258
+#: data/gui/window/preferences/02_hotkeys.cfg:252
 msgid "Clear Hotkey"
 msgstr "ホットキーの消去"
 
@@ -4378,116 +4471,91 @@ msgid "Add a timestamp to chat messages"
 msgstr "チャットメッセージに時刻を表示します"
 
 #. [toggle_button]: id=remember_password
-#: data/gui/window/preferences/05_multiplayer.cfg:68
-msgid "Save password to preferences (plain text)"
-msgstr "パスワードを保存する（プレインテキスト）"
-
-#. [toggle_button]: id=remember_password
 #: data/gui/window/preferences/05_multiplayer.cfg:69
 msgid "Uncheck to delete the saved password (on exit)"
-msgstr "終了時に、パスワードをプレインテキストとして設定ファイルに保存します"
-
-#. [toggle_button]: id=lobby_sort_players
-#: data/gui/window/preferences/05_multiplayer.cfg:84
-msgid "Sort lobby list"
-msgstr "ロビーリストを並び替える"
-
-#. [toggle_button]: id=lobby_sort_players
-#: data/gui/window/preferences/05_multiplayer.cfg:85
-msgid "Sort the player list in the lobby by player groups"
-msgstr "プレイヤーリストをグループ（友人、フォーラムに登録済みなど）で並び替えます"
-
-#. [toggle_button]: id=lobby_player_icons
-#: data/gui/window/preferences/05_multiplayer.cfg:98
-msgid "Iconize lobby list"
-msgstr "ロビーリストにアイコンを表示"
-
-#. [toggle_button]: id=lobby_player_icons
-#: data/gui/window/preferences/05_multiplayer.cfg:99
-msgid "Show icons in front of the player names in the lobby"
-msgstr "プレイヤー名の前にアイコンを表示します"
+msgstr "チェックをはずすと、終了時に保存されたパスワードを削除します"
 
 #. [toggle_button]: id=lobby_whisper_friends_only
-#: data/gui/window/preferences/05_multiplayer.cfg:112
+#: data/gui/window/preferences/05_multiplayer.cfg:84
 msgid "Accept whispers from friends only"
 msgstr "友人からのささやきのみを受け入れる"
 
 #. [toggle_button]: id=lobby_whisper_friends_only
-#: data/gui/window/preferences/05_multiplayer.cfg:113
+#: data/gui/window/preferences/05_multiplayer.cfg:85
 msgid "Only accept whisper messages from people on your friends list"
 msgstr "友人リストに含まれているプレイヤーからのささやきだけを受け入れます"
 
 #. [toggle_button]: id=lobby_joins_none
-#: data/gui/window/preferences/05_multiplayer.cfg:129
+#: data/gui/window/preferences/05_multiplayer.cfg:101
 msgid "Do not show lobby joins"
 msgstr "ロビーへの参加者を通知しない"
 
 #. [toggle_button]: id=lobby_joins_none
-#: data/gui/window/preferences/05_multiplayer.cfg:130
+#: data/gui/window/preferences/05_multiplayer.cfg:102
 msgid "Do not show messages about players joining the multiplayer lobby"
 msgstr "マルチプレイヤーロビーに他のプレイヤーが参加した時に、通知メッセージを表示しません"
 
 #. [toggle_button]: id=lobby_joins_friends
-#: data/gui/window/preferences/05_multiplayer.cfg:144
+#: data/gui/window/preferences/05_multiplayer.cfg:116
 msgid "Show lobby joins of friends only"
 msgstr "ロビーへの参加者を友人のみ通知する"
 
 #. [toggle_button]: id=lobby_joins_friends
-#: data/gui/window/preferences/05_multiplayer.cfg:145
+#: data/gui/window/preferences/05_multiplayer.cfg:117
 msgid "Show messages about your friends joining the multiplayer lobby"
 msgstr "マルチプレイヤーロビーに友人が参加した時に、通知メッセージを表示します"
 
 #. [toggle_button]: id=lobby_joins_all
-#: data/gui/window/preferences/05_multiplayer.cfg:159
+#: data/gui/window/preferences/05_multiplayer.cfg:131
 msgid "Show all lobby joins"
 msgstr "ロビーへの参加者を全て通知する"
 
 #. [toggle_button]: id=lobby_joins_all
-#: data/gui/window/preferences/05_multiplayer.cfg:160
+#: data/gui/window/preferences/05_multiplayer.cfg:132
 msgid "Show messages about all players joining the multiplayer lobby"
 msgstr "マルチプレイヤーロビーに他のプレイヤーが参加した時に、通知メッセージを表示します"
 
 #. [button]: id=mp_alerts
-#: data/gui/window/preferences/05_multiplayer.cfg:177
+#: data/gui/window/preferences/05_multiplayer.cfg:149
 msgid "Alerts"
 msgstr "通知"
 
 #. [button]: id=mp_alerts
-#: data/gui/window/preferences/05_multiplayer.cfg:178
+#: data/gui/window/preferences/05_multiplayer.cfg:150
 msgid "Configure multiplayer notification settings"
 msgstr "マルチプレイヤー時の通知を設定します"
 
 #. [button]: id=mp_wesnothd
-#: data/gui/window/preferences/05_multiplayer.cfg:190
+#: data/gui/window/preferences/05_multiplayer.cfg:162
 msgid "Server Executable"
 msgstr "サーバーのパス"
 
 #. [button]: id=mp_wesnothd
-#: data/gui/window/preferences/05_multiplayer.cfg:191
+#: data/gui/window/preferences/05_multiplayer.cfg:163
 msgid "Find and set path to MP server to host LAN games"
 msgstr "ホストLANゲーム時に使用する、マルチプレイヤーサーバーのパスを指定します"
 
 #. [button]: id=add_friend
-#: data/gui/window/preferences/05_multiplayer.cfg:292
+#: data/gui/window/preferences/05_multiplayer.cfg:264
 msgid ""
 "Add this username to your friends list (add optional notes, e.g., "
 "'player_name notes on friend')"
 msgstr "このユーザー名を友人リストに追加します（次のように入力するとオプションとしてメモを追加することもできます。「ユーザー名 メモ」）"
 
 #. [button]: id=add_ignored
-#: data/gui/window/preferences/05_multiplayer.cfg:305
+#: data/gui/window/preferences/05_multiplayer.cfg:277
 msgid ""
 "Add this username to your ignore list (add optional reason, e.g., "
 "'player_name reason ignored')"
 msgstr "このユーザを無視リストに追加します（オプションとして理由も付加可能です。例：player_name reason ignored）"
 
 #. [button]: id=remove
-#: data/gui/window/preferences/05_multiplayer.cfg:318
+#: data/gui/window/preferences/05_multiplayer.cfg:290
 msgid "Remove this username from your list"
 msgstr "ユーザ名をリストから削除します"
 
 #. [label]: id=no_friends_notice
-#: data/gui/window/preferences/05_multiplayer.cfg:339
+#: data/gui/window/preferences/05_multiplayer.cfg:311
 msgid "You have not befriended or ignored any other players."
 msgstr "友人/無視リストに追加されたプレイヤーはいません。"
 
@@ -4501,21 +4569,23 @@ msgstr "開く"
 msgid "Open this file with an external application"
 msgstr "このファイルを外部アプリケーションで開きます"
 
-#. [label]: id=title
-#: data/gui/window/screenshot_notification.cfg:94
-msgid "Screenshot Saved"
-msgstr "スクリーンショットの保存完了"
-
 #. [button]: id=browse_dir
-#: data/gui/window/screenshot_notification.cfg:184
+#: data/gui/window/screenshot_notification.cfg:187
 msgid "Screenshots..."
 msgstr "保存フォルダを開く"
 
 #. [button]: id=browse_dir
-#: data/gui/window/screenshot_notification.cfg:186
+#: data/gui/window/screenshot_notification.cfg:189
 msgid "Browse the screenshots folder using a file manager"
 msgstr "ファイルマネージャでスクリーンショットフォルダをブラウズします"
 
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [button]: id=save
+#: data/gui/window/screenshot_notification.cfg:203
+#: src/gui/dialogs/file_dialog.cpp:185
+msgid "Save"
+msgstr "保存"
+
 #. [label]
 #: data/gui/window/select_orb_colors.cfg:80
 msgid "Choose Orb/Minimap Colors"
@@ -4547,45 +4617,66 @@ msgid "Show enemy orb"
 msgstr "敵ユニットに宝珠を表示"
 
 #. [label]
-#: data/gui/window/sp_options_configure.cfg:40
+#: data/gui/window/sp_options_configure.cfg:44
 msgid "Configure Options"
 msgstr "オプション設定"
 
 #. [label]
-#: data/gui/window/sp_options_configure.cfg:58
+#: data/gui/window/sp_options_configure.cfg:62
 msgid "Configure settings for the selected custom modifications."
 msgstr "カスタムModの設定を変更することができます。"
 
 #. [label]
 #: data/gui/window/statistics_dialog.cfg:129
 msgid "Damage"
-msgstr ""
+msgstr "ダメージ"
 
 #. [label]
 #: data/gui/window/statistics_dialog.cfg:141
 msgid "Overall"
-msgstr ""
+msgstr "総計"
 
 #. [label]
 #: data/gui/window/statistics_dialog.cfg:153
 msgid "This Turn"
-msgstr ""
+msgstr "このターン"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=title
-#: data/gui/window/statistics_dialog.cfg:432 src/hotkey/hotkey_command.cpp:91
+#: data/gui/window/statistics_dialog.cfg:432 src/hotkey/hotkey_command.cpp:102
 msgid "Statistics"
 msgstr "統計情報"
 
 #. [widget]: id=tab_label
 #: data/gui/window/statistics_dialog.cfg:485
 msgid "Scenario"
-msgstr ""
+msgstr "シナリオ"
 
 #. [widget]: id=tab_label
 #: data/gui/window/statistics_dialog.cfg:498
 msgid "Campaign"
-msgstr ""
+msgstr "キャンペーン"
+
+#. [button]: id=cancel
+#: data/gui/window/story_viewer.cfg:131
+msgid "Skip"
+msgstr "スキップ"
+
+#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
+#. [label]: id=lblTitle
+#: data/gui/window/surrender_quit.cfg:40 src/hotkey/hotkey_command.cpp:105
+msgid "Surrender Game"
+msgstr "ゲームの負けを認める"
+
+#. [label]: id=lblMessage
+#: data/gui/window/surrender_quit.cfg:60
+msgid "Do you really want to surrender and quit the game?"
+msgstr "負けを認めて退出します。本当によろしいですか？"
+
+#. [button]: id=quit_and_surrender
+#: data/gui/window/surrender_quit.cfg:85
+msgid "Surrender & Quit"
+msgstr "負けを認めて退出する"
 
 #. [label]: id=lblTitle
 #: data/gui/window/synced_choice_wait.cfg:40
@@ -4605,53 +4696,53 @@ msgstr "ゲーム終了"
 #. [label]
 #: data/gui/window/terrain_layers.cfg:21
 msgid "#"
-msgstr ""
+msgstr "#"
+
+#. [label]
+#: data/gui/window/terrain_layers.cfg:33
+msgid "Image"
+msgstr "画像"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:57
 msgid "Loc"
-msgstr ""
+msgstr "場所"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:69
 msgid "Layer"
-msgstr ""
+msgstr "レイヤー"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:81
 msgid "Base.x"
-msgstr ""
+msgstr "Base.x"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:93
 msgid "Base.y"
-msgstr ""
+msgstr "Base.y"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:105
 msgid "Center"
-msgstr ""
+msgstr "中央"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:339
 msgid "Terrain Layers"
-msgstr ""
+msgstr "地形レイヤー"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:384
 msgid "Flags"
-msgstr ""
+msgstr "フラグ"
 
 #. [label]
 #: data/gui/window/theme_list.cfg:51
 msgid "Choose Theme"
 msgstr "テーマ選択"
 
-#. [label]
-#: data/gui/window/theme_list.cfg:67
-msgid "The new theme will take effect after loading or starting a new game."
-msgstr "新しいテーマは次に読み込まれたゲームから適用されます。"
-
 #. [button]: id=help
 #: data/gui/window/title_screen.cfg:175
 msgid "Show Battle for Wesnoth help"
@@ -4674,14 +4765,12 @@ msgstr "チュートリアルを開始し、ゲームの基本を学びます"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [grid]
-#: data/gui/window/title_screen.cfg:251 src/gui/dialogs/game_load.cpp:322
+#: data/gui/window/title_screen.cfg:251 src/gui/dialogs/game_load.cpp:335
 msgid "Tutorial"
 msgstr "チュートリアル"
 
-#. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [grid]
 #: data/gui/window/title_screen.cfg:252
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:98
 msgid "Campaigns"
 msgstr "キャンペーン"
 
@@ -4768,12 +4857,12 @@ msgid "Display the game version and build information"
 msgstr "ゲームバージョンとビルド情報を表示する"
 
 #. [label]
-#: data/gui/window/unit_advance.cfg:98
+#: data/gui/window/unit_advance.cfg:99
 msgid "Advance Unit"
 msgstr "ユニットのレベルアップ"
 
 #. [label]
-#: data/gui/window/unit_advance.cfg:142
+#: data/gui/window/unit_advance.cfg:143
 msgid "What should our victorious unit become?"
 msgstr "勝者はどの道を歩むのでしょうか？"
 
@@ -4792,19 +4881,14 @@ msgstr "攻撃"
 msgid "Attack Enemy"
 msgstr "敵を攻撃"
 
-#. [label]
-#: data/gui/window/unit_attack.cfg:331
-msgid "Choose weapon:"
-msgstr "武器選択："
-
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
-#: data/gui/window/unit_create.cfg:47 src/hotkey/hotkey_command.cpp:85
+#: data/gui/window/unit_create.cfg:47 src/hotkey/hotkey_command.cpp:96
 msgid "Create Unit (Debug!)"
 msgstr "ユニット作成（デバッグモード）"
 
 #. [toggle_button]: id=sort_0
-#: data/gui/window/unit_create.cfg:148
+#: data/gui/window/unit_create.cfg:123
 msgid "Race"
 msgstr "種族"
 
@@ -4813,6 +4897,11 @@ msgstr "種族"
 msgid "Moves"
 msgstr "移動力"
 
+#. [label]
+#: data/gui/window/unit_list.cfg:121
+msgid "Status"
+msgstr "ステータス"
+
 #. [toggle_button]: id=sort_3
 #: data/gui/window/unit_list.cfg:135
 msgid "HP"
@@ -4834,14 +4923,14 @@ msgstr "XP"
 #. [toggle_button]: id=sort_6
 #. [toggle_button]: id=sort_4
 #: data/gui/window/unit_list.cfg:177 data/gui/window/unit_recall.cfg:89
-#: src/gui/widgets/unit_preview_pane.cpp:229
-#: src/gui/widgets/unit_preview_pane.cpp:371
+#: src/gui/widgets/unit_preview_pane.cpp:344
+#: src/gui/widgets/unit_preview_pane.cpp:487
 msgid "Traits"
 msgstr "特性"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
-#: data/gui/window/unit_list.cfg:368 src/hotkey/hotkey_command.cpp:90
+#: data/gui/window/unit_list.cfg:368 src/hotkey/hotkey_command.cpp:101
 msgid "Unit List"
 msgstr "ユニット一覧"
 
@@ -4851,13 +4940,13 @@ msgid "Recall Unit"
 msgstr "ユニットの召還"
 
 #. [button]: id=dismiss
-#: data/gui/window/unit_recall.cfg:410
+#: data/gui/window/unit_recall.cfg:384
 msgid "Dismiss"
 msgstr "解雇"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [button]: id=ok
-#: data/gui/window/unit_recall.cfg:444 src/hotkey/hotkey_command.cpp:75
+#: data/gui/window/unit_recall.cfg:418 src/hotkey/hotkey_command.cpp:86
 msgid "Recall"
 msgstr "召還"
 
@@ -4868,289 +4957,461 @@ msgstr "ユニットの雇用"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [button]: id=ok
-#: data/gui/window/unit_recruit.cfg:219 src/hotkey/hotkey_command.cpp:73
+#: data/gui/window/unit_recruit.cfg:219 src/hotkey/hotkey_command.cpp:84
 msgid "Recruit"
 msgstr "雇用"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]
-#: data/gui/window/wml_error.cfg:40 src/gui/dialogs/message.cpp:212
-#: src/gui/dialogs/preferences_dialog.cpp:199
-#: src/gui/dialogs/transient_message.cpp:81
+#: data/gui/window/wml_error.cfg:40 src/gui/dialogs/message.cpp:210
+#: src/gui/dialogs/preferences_dialog.cpp:267
+#: src/gui/dialogs/transient_message.cpp:78
 msgid "Error"
 msgstr "エラー"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=details_heading
-#: data/gui/window/wml_error.cfg:112 src/gui/dialogs/lobby/lobby.cpp:905
-#: src/gui/dialogs/lobby/lobby.cpp:921 src/gui/dialogs/wml_error.cpp:196
+#: data/gui/window/wml_error.cfg:112 src/gui/dialogs/multiplayer/lobby.cpp:228
+#: src/gui/dialogs/multiplayer/lobby.cpp:244 src/gui/dialogs/wml_error.cpp:197
 msgid "Details:"
 msgstr "情報："
 
-#: src/build_info.cpp:168
+#: src/build_info.cpp:263
 msgid "feature^Experimental OpenMP support"
 msgstr "実験的なOpenMPのサポート"
 
-#: src/build_info.cpp:173
-msgid "feature^PNG screenshots"
-msgstr "PNGスクリーンショット"
+#: src/build_info.cpp:268
+msgid "feature^JPG screenshots"
+msgstr ""
 
-#: src/build_info.cpp:178
+#: src/build_info.cpp:275
 msgid "feature^Lua console completion"
 msgstr "Luaコンソールでの補完機能"
 
-#: src/build_info.cpp:183
+#: src/build_info.cpp:280
 msgid "feature^Legacy bidirectional rendering"
 msgstr "レガシーな双方向レンダリング"
 
-#: src/build_info.cpp:190
+#: src/build_info.cpp:287
 msgid "feature^D-Bus notifications back end"
 msgstr "D-Bus通知バックエンド"
 
-#: src/build_info.cpp:199
+#: src/build_info.cpp:296
 msgid "feature^Win32 notifications back end"
 msgstr "Win32通知バックエンド"
 
-#: src/build_info.cpp:205
+#: src/build_info.cpp:302
 msgid "feature^Cocoa notifications back end"
 msgstr "Cocoa通知バックエンド"
 
-#: src/build_info.cpp:210
+#: src/build_info.cpp:307
 msgid "feature^Growl notifications back end"
 msgstr "Growl通知バックエンド"
 
-#: src/desktop/paths.cpp:97
+#: src/desktop/paths.cpp:96
 msgid "filesystem_path_system^Volumes"
 msgstr "ボリューム"
 
-#: src/desktop/paths.cpp:201
+#: src/desktop/paths.cpp:200
 msgid "filesystem_path_game^Game executables"
 msgstr "ゲームプログラム"
 
-#: src/desktop/paths.cpp:205
+#: src/desktop/paths.cpp:204
 msgid "filesystem_path_game^Game data"
 msgstr "ゲームデータ"
 
-#: src/desktop/paths.cpp:209
+#: src/desktop/paths.cpp:208
 msgid "filesystem_path_game^User data"
 msgstr "ユーザーデータ"
 
-#: src/desktop/paths.cpp:213
+#: src/desktop/paths.cpp:212
 msgid "filesystem_path_game^User preferences"
 msgstr "ユーザ設定"
 
-#: src/desktop/paths.cpp:226
+#: src/desktop/paths.cpp:225
 msgid "filesystem_path_system^Home"
 msgstr "ホーム"
 
-#: src/desktop/paths.cpp:235
+#: src/desktop/paths.cpp:234
 msgid "filesystem_path_system^Root"
 msgstr "ルート"
 
-#: src/desktop/version.cpp:276
+#: src/desktop/version.cpp:292
 msgid "operating_system^<unknown>"
 msgstr "<不明>"
 
-#: src/font/marked-up_text.cpp:415
+#: src/font/marked-up_text.cpp:402
 msgid "The maximum text width is less than 1."
 msgstr "最大テキスト幅が1より小さいです。"
 
-#: src/font/text.cpp:781
+#: src/font/text.cpp:761
 msgid "The text contains invalid markup: "
 msgstr "テキストに無効なマークアップが含まれています："
 
-#: src/game_preferences.cpp:412
-msgid "No server has been defined."
-msgstr "サーバーが1つも設定されていません。"
+#. TRANSLATORS: Formats a two-element conjunctive list.
+#: src/formula/string_utils.cpp:251
+msgid "conjunct pair^$first and $second"
+msgstr "$first および $second"
+
+#. TRANSLATORS: Formats the first two elements of a conjunctive list.
+#: src/formula/string_utils.cpp:254
+msgid "conjunct start^$first, $second"
+msgstr "$first、$second"
+
+#. TRANSLATORS: Formats successive elements of a conjunctive list.
+#: src/formula/string_utils.cpp:258
+msgid "conjunct mid^$prefix, $next"
+msgstr "$prefix、$next"
+
+#. TRANSLATORS: Formats the final element of a conjunctive list.
+#: src/formula/string_utils.cpp:261
+msgid "conjunct end^$prefix, and $last"
+msgstr "$prefix および $last"
+
+#. TRANSLATORS: Formats a two-element disjunctive list.
+#: src/formula/string_utils.cpp:269
+msgid "disjunct pair^$first or $second"
+msgstr "$first または $second"
+
+#. TRANSLATORS: Formats the first two elements of a disjunctive list.
+#: src/formula/string_utils.cpp:272
+msgid "disjunct start^$first, $second"
+msgstr "$first、$second"
+
+#. TRANSLATORS: Formats successive elements of a disjunctive list.
+#: src/formula/string_utils.cpp:276
+msgid "disjunct mid^$prefix, $next"
+msgstr "$prefix、$next"
+
+#. TRANSLATORS: Formats the final element of a disjunctive list.
+#: src/formula/string_utils.cpp:279
+msgid "disjunct end^$prefix, or $last"
+msgstr "$prefix または $last"
+
+#: src/gui/core/canvas.cpp:612
+msgid "Line doesn't fit on canvas."
+msgstr "線がキャンバスに合いません。"
+
+#: src/gui/core/canvas.cpp:699
+msgid "Rectangle doesn't fit on canvas."
+msgstr "長方形がキャンバスに合いません。"
 
-#: src/game_preferences.cpp:511
-msgid "player"
-msgstr "プレイヤー"
+#: src/gui/core/canvas.cpp:814
+msgid "Rounded Rectangle doesn't fit on canvas."
+msgstr "角が丸い長方形はこのキャンバスに合いません。"
 
-#: src/game_preferences.cpp:1046
-msgid "[%H:%M]"
-msgstr "[%H:%M]"
+#: src/gui/core/canvas.cpp:923 src/gui/core/canvas.cpp:928
+#: src/gui/core/canvas.cpp:933 src/gui/core/canvas.cpp:939
+msgid "Circle doesn't fit on canvas."
+msgstr "円がキャンバスに合いません。"
+
+#: src/gui/core/canvas.cpp:1039
+msgid "Image doesn't fit on canvas."
+msgstr "画像がキャンバスに合いません。"
+
+#: src/gui/core/canvas.cpp:1257
+msgid "Text has a font size of 0."
+msgstr "テキストのフォントサイズが 0 です。"
+
+#: src/gui/core/canvas.cpp:1331
+msgid "Text doesn't start on canvas."
+msgstr "テキストがキャンバス上から始まっていません。"
+
+#: src/gui/core/widget_definition.cpp:49
+msgid "No state or draw section defined."
+msgstr "stateもしくはdraw sectionがひとつも設定されていません。"
+
+#: src/gui/core/widget_definition.cpp:176 src/gui/core/window_builder.cpp:176
+msgid "No resolution defined."
+msgstr "解像度（resolution）が1つも定義されていません。"
+
+#: src/gui/core/window_builder.cpp:58
+msgid "Linked '$id' group has multiple definitions."
+msgstr "「 $id 」に結び付けられたグループに重複する定義があります。"
+
+#: src/gui/core/window_builder.cpp:314 src/gui/widgets/addon_list.cpp:429
+#: src/gui/widgets/chatbox.cpp:762 src/gui/widgets/listbox.cpp:819
+#: src/gui/widgets/multi_page.cpp:196 src/gui/widgets/panel.cpp:194
+#: src/gui/widgets/scroll_label.cpp:220 src/gui/widgets/scrollbar_panel.cpp:98
+#: src/gui/widgets/size_lock.cpp:119 src/gui/widgets/stacked_widget.cpp:241
+#: src/gui/widgets/toggle_panel.cpp:402 src/gui/widgets/tree_view.cpp:311
+#: src/gui/widgets/unit_preview_pane.cpp:573
+msgid "No grid defined."
+msgstr "グリッド（grid）が定義されていません。"
+
+#: src/gui/core/window_builder.cpp:433
+msgid "A row must have a column."
+msgstr "一つの行（row）には一つの列（column）がなければなりません。"
+
+#: src/gui/core/window_builder.cpp:434
+msgid "Number of columns differ."
+msgstr "列（column）の数が違います。"
+
+#: src/gui/dialogs/addon/manager.cpp:189
+msgid "addons_view^All Add-ons"
+msgstr "全てのアドオン"
+
+#: src/gui/dialogs/addon/manager.cpp:190
+msgid "addons_view^Installed"
+msgstr "インストール済み"
+
+#: src/gui/dialogs/addon/manager.cpp:191
+msgid "addons_view^Upgradable"
+msgstr "アップデート有り"
+
+#: src/gui/dialogs/addon/manager.cpp:192
+msgid "addons_view^Publishable"
+msgstr "公開済み"
+
+#: src/gui/dialogs/addon/manager.cpp:193
+msgid "addons_view^Not Installed"
+msgstr "未インストール"
+
+#: src/gui/dialogs/addon/manager.cpp:197
+msgid "addons_of_type^Campaigns"
+msgstr "キャンペーン"
+
+#: src/gui/dialogs/addon/manager.cpp:198
+msgid "addons_of_type^Scenarios"
+msgstr "シナリオ"
+
+#: src/gui/dialogs/addon/manager.cpp:199
+msgid "addons_of_type^SP/MP campaigns"
+msgstr "SP/MP キャンペーン"
+
+#: src/gui/dialogs/addon/manager.cpp:200
+msgid "addons_of_type^MP campaigns"
+msgstr "MP キャンペーン"
+
+#: src/gui/dialogs/addon/manager.cpp:201
+msgid "addons_of_type^MP scenarios"
+msgstr "MP シナリオ"
+
+#: src/gui/dialogs/addon/manager.cpp:202
+msgid "addons_of_type^MP map-packs"
+msgstr "MP マップパック"
+
+#: src/gui/dialogs/addon/manager.cpp:203
+msgid "addons_of_type^MP eras"
+msgstr "MP 時代"
 
-#: src/game_preferences.cpp:1049
-msgid "[%I:%M %p]"
-msgstr "[%I:%M %p]"
+#: src/gui/dialogs/addon/manager.cpp:204
+msgid "addons_of_type^MP factions"
+msgstr "MP 党派"
 
-#: src/gui/core/canvas.cpp:601
-msgid "Line doesn't fit on canvas."
-msgstr "線がキャンバスに合いません。"
+#: src/gui/dialogs/addon/manager.cpp:205
+msgid "addons_of_type^Modifications"
+msgstr "Mod"
 
-#: src/gui/core/canvas.cpp:732
-msgid "Rectangle doesn't fit on canvas."
-msgstr "長方形がキャンバスに合いません。"
+#: src/gui/dialogs/addon/manager.cpp:206
+msgid "addons_of_type^Cores"
+msgstr "コア"
 
-#: src/gui/core/canvas.cpp:852 src/gui/core/canvas.cpp:857
-#: src/gui/core/canvas.cpp:862 src/gui/core/canvas.cpp:868
-msgid "Circle doesn't fit on canvas."
-msgstr "円がキャンバスに合いません。"
+#: src/gui/dialogs/addon/manager.cpp:207
+msgid "addons_of_type^Resources"
+msgstr "素材集"
 
-#: src/gui/core/canvas.cpp:1056 src/gui/core/canvas.cpp:1063
-#: src/gui/core/canvas.cpp:1073 src/gui/core/canvas.cpp:1080
-msgid "Image doesn't fit on canvas."
-msgstr "画像がキャンバスに合いません。"
+#: src/gui/dialogs/addon/manager.cpp:209
+msgid "addons_of_type^Other"
+msgstr "その他"
 
-#: src/gui/core/canvas.cpp:1308
-msgid "Text has a font size of 0."
-msgstr "テキストのフォントサイズが 0 です。"
+#: src/gui/dialogs/addon/manager.cpp:210
+msgid "addons_of_type^Unknown"
+msgstr "不明"
 
-#: src/gui/core/canvas.cpp:1385
-msgid "Text doesn't start on canvas."
-msgstr "テキストがキャンバス上から始まっていません。"
+#: src/gui/dialogs/addon/manager.cpp:214
+msgid "addons_order^Name ($order)"
+msgstr "名前（$order）"
 
-#: src/gui/core/widget_definition.cpp:148 src/gui/core/window_builder.cpp:266
-msgid "No resolution defined."
-msgstr "解像度（resolution）が1つも定義されていません。"
+#: src/gui/dialogs/addon/manager.cpp:217
+msgid "addons_order^Author ($order)"
+msgstr "作者（$order）"
 
-#: src/gui/core/window_builder.cpp:99
-msgid "Linked '$id' group has multiple definitions."
-msgstr "ã\80\8c $id ã\80\8dã\81«çµ\90ã\81³ä»\98ã\81\91ã\82\89ã\82\8cã\81\9fã\82°ã\83«ã\83¼ã\83\97ã\81«é\87\8dè¤\87ã\81\99ã\82\8bå®\9a義ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\80\82"
+#: src/gui/dialogs/addon/manager.cpp:220
+msgid "addons_order^Size ($order)"
+msgstr "ã\82µã\82¤ã\82ºï¼\88$orderï¼\89"
 
-#: src/gui/core/window_builder.cpp:407 src/gui/widgets/chatbox.cpp:746
-#: src/gui/widgets/listbox.cpp:806 src/gui/widgets/multi_page.cpp:216
-#: src/gui/widgets/panel.cpp:196 src/gui/widgets/scroll_label.cpp:197
-#: src/gui/widgets/scrollbar_panel.cpp:99 src/gui/widgets/size_lock.cpp:99
-#: src/gui/widgets/stacked_widget.cpp:200 src/gui/widgets/toggle_panel.cpp:421
-#: src/gui/widgets/tree_view.cpp:312 src/gui/widgets/unit_preview_pane.cpp:459
-msgid "No grid defined."
-msgstr "グリッド（grid）が定義されていません。"
+#: src/gui/dialogs/addon/manager.cpp:223
+msgid "addons_order^Downloads ($order)"
+msgstr "ダウンロード数（$order）"
 
-#: src/gui/core/window_builder.cpp:439
-msgid "Linked '$id' group needs a 'fixed_width' or 'fixed_height' key."
-msgstr "ã\80\8c $id ã\80\8dã\81«çµ\90ã\81³ä»\98ã\81\91ã\82\89ã\82\8cã\81\9fã\82°ã\83«ã\83¼ã\83\97ã\81«ã\81¯ã\80\8c fixed_width ã\80\8dã\81¾ã\81\9fã\81¯ã\80\8c fixed_height ã\80\8dã\82­ã\83¼ã\81\8cå¿\85è¦\81ã\81§ã\81\99ã\80\82"
+#: src/gui/dialogs/addon/manager.cpp:226
+msgid "addons_order^Type ($order)"
+msgstr "ã\82¿ã\82¤ã\83\97ï¼\88$orderï¼\89"
 
-#: src/gui/core/window_builder.cpp:553
-msgid "A row must have a column."
-msgstr "一つの行（row）には一つの列（column）がなければなりません。"
+#: src/gui/dialogs/addon/manager.cpp:229
+msgid "addons_order^Last updated ($order)"
+msgstr "最終更新（$order）"
 
-#: src/gui/core/window_builder.cpp:554
-msgid "Number of columns differ."
-msgstr "å\88\97ï¼\88columnï¼\89ã\81®æ\95°ã\81\8cé\81\95ã\81\84ã\81¾ã\81\99ã\80\82"
+#: src/gui/dialogs/addon/manager.cpp:232
+msgid "addons_order^First uploaded ($order)"
+msgstr "å\88\9dã\82¢ã\83\83ã\83\97ã\83­ã\83¼ã\83\89ï¼\88$orderï¼\89"
 
-#: src/gui/dialogs/addon/description.cpp:110
-#: src/gui/dialogs/addon/manager.cpp:224 src/gui/dialogs/addon/manager.cpp:264
+#: src/gui/dialogs/addon/manager.cpp:261 src/gui/widgets/addon_list.cpp:103
 msgid "addon_state^Not installed"
 msgstr "未インストール"
 
-#: src/gui/dialogs/addon/description.cpp:112
-#: src/gui/dialogs/addon/manager.cpp:224 src/gui/dialogs/addon/manager.cpp:266
+#: src/gui/dialogs/addon/manager.cpp:262 src/gui/widgets/addon_list.cpp:103
 msgid "addon_state^Published, not installed"
 msgstr "公開済み、未インストール"
 
-#: src/gui/dialogs/addon/description.cpp:117
-#: src/gui/dialogs/addon/manager.cpp:232 src/gui/dialogs/addon/manager.cpp:271
+#: src/gui/dialogs/addon/manager.cpp:266 src/gui/widgets/addon_list.cpp:111
 msgid "addon_state^Installed"
 msgstr "インストール済み"
 
-#: src/gui/dialogs/addon/description.cpp:119
-#: src/gui/dialogs/addon/manager.cpp:232 src/gui/dialogs/addon/manager.cpp:273
+#: src/gui/dialogs/addon/manager.cpp:267 src/gui/widgets/addon_list.cpp:111
 msgid "addon_state^Published"
 msgstr "公開済み"
 
-#: src/gui/dialogs/addon/description.cpp:124
-#: src/gui/dialogs/addon/manager.cpp:278
+#: src/gui/dialogs/addon/manager.cpp:271
 msgid "addon_state^Installed, not tracking local version"
 msgstr "インストール済み、トラッキングされていないローカルバージョン"
 
-#: src/gui/dialogs/addon/description.cpp:128
-#: src/gui/dialogs/addon/manager.cpp:282
+#: src/gui/dialogs/addon/manager.cpp:274
 msgid "addon_state^Published, not tracking local version"
 msgstr "公開済み、トラッキングされていないローカルバージョン"
 
-#: src/gui/dialogs/addon/description.cpp:134
-#: src/gui/dialogs/addon/manager.cpp:288
+#: src/gui/dialogs/addon/manager.cpp:278
 msgid "addon_state^Installed ($local_version|), upgradable"
 msgstr "インストール済み（ $local_version| ）、アップデート有り"
 
-#: src/gui/dialogs/addon/description.cpp:136
-#: src/gui/dialogs/addon/manager.cpp:290
+#: src/gui/dialogs/addon/manager.cpp:279
 msgid "addon_state^Published ($local_version| installed), upgradable"
 msgstr "公開済み（ $local_version| インストール済み）、アップデート有り"
 
-#: src/gui/dialogs/addon/description.cpp:143
-#: src/gui/dialogs/addon/manager.cpp:297
+#: src/gui/dialogs/addon/manager.cpp:285
 msgid "addon_state^Installed ($local_version|), outdated on server"
 msgstr "インストール済み（ $local_version| ）、サーバー上に旧バージョン有り"
 
-#: src/gui/dialogs/addon/description.cpp:145
-#: src/gui/dialogs/addon/manager.cpp:299
+#: src/gui/dialogs/addon/manager.cpp:286
 msgid "addon_state^Published ($local_version| installed), outdated on server"
 msgstr "公開済み（$local_version| インストール済み）、サーバー上に旧バージョン有り"
 
-#: src/gui/dialogs/addon/description.cpp:151
-#: src/gui/dialogs/addon/manager.cpp:244 src/gui/dialogs/addon/manager.cpp:305
+#: src/gui/dialogs/addon/manager.cpp:292 src/gui/widgets/addon_list.cpp:114
+msgid "addon_state^Installed, not ready to publish"
+msgstr "インストール済み、公開準備未了"
+
+#: src/gui/dialogs/addon/manager.cpp:293 src/gui/widgets/addon_list.cpp:114
+msgid "addon_state^Ready to publish"
+msgstr "公開準備完了"
+
+#: src/gui/dialogs/addon/manager.cpp:297 src/gui/widgets/addon_list.cpp:126
 msgid "addon_state^Installed, broken"
 msgstr "インストール済み、破損"
 
-#: src/gui/dialogs/addon/description.cpp:153
-#: src/gui/dialogs/addon/manager.cpp:244 src/gui/dialogs/addon/manager.cpp:307
+#: src/gui/dialogs/addon/manager.cpp:298 src/gui/widgets/addon_list.cpp:126
 msgid "addon_state^Published, broken"
 msgstr "公開済み、破損"
 
-#: src/gui/dialogs/addon/description.cpp:157
-#: src/gui/dialogs/addon/manager.cpp:248 src/gui/dialogs/addon/manager.cpp:311
+#: src/gui/dialogs/addon/manager.cpp:301 src/gui/widgets/addon_list.cpp:130
 msgid "addon_state^Unknown"
 msgstr "不明"
 
-#: src/gui/dialogs/addon/description.cpp:395
-#: src/gui/dialogs/addon/manager.cpp:399 src/gui/dialogs/chat_log.cpp:421
-#: src/gui/dialogs/game_cache_options.cpp:106
-#: src/gui/dialogs/game_version.cpp:188
+#. TRANSLATORS: ascending
+#: src/gui/dialogs/addon/manager.cpp:361
+msgid "asc"
+msgstr "昇順"
+
+#. TRANSLATORS: descending
+#: src/gui/dialogs/addon/manager.cpp:365
+msgid "desc"
+msgstr "降順"
+
+#: src/gui/dialogs/addon/manager.cpp:381 src/gui/dialogs/chat_log.cpp:420
+#: src/gui/dialogs/game_cache_options.cpp:105
+#: src/gui/dialogs/game_version.cpp:186
 #: src/gui/dialogs/gamestate_inspector.cpp:428
-#: src/gui/dialogs/lua_interpreter.cpp:481
-#: src/gui/dialogs/screenshot_notification.cpp:96
-#: src/gui/dialogs/wml_error.cpp:228
+#: src/gui/dialogs/lua_interpreter.cpp:490
+#: src/gui/dialogs/screenshot_notification.cpp:101
+#: src/gui/dialogs/wml_error.cpp:229
 msgid "Clipboard support not found, contact your packager"
 msgstr "クリップボードサポートが無効となっています。パッケージャーに連絡してください。"
 
-#: src/gui/dialogs/addon/filter_options.cpp:277
-msgid "addons_view^Not Installed"
-msgstr "未インストール"
-
-#: src/gui/dialogs/addon/filter_options.cpp:279
-msgid "addons_view^Upgradable"
-msgstr "アップデート有り"
+#: src/gui/dialogs/addon/manager.cpp:449
+msgid "addons^Back to List"
+msgstr "リストに"
 
-#: src/gui/dialogs/addon/filter_options.cpp:281
-msgid "addons_view^Installed"
-msgstr "ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«æ¸\88ã\81¿"
+#: src/gui/dialogs/addon/manager.cpp:461
+msgid "An error occurred while downloading the add-ons list from the server."
+msgstr "ã\82µã\83¼ã\83\90ã\83¼ã\81\8bã\82\89ã\82¢ã\83\89ã\82ªã\83³ä¸\80覧ã\82\92ã\83\80ã\82¦ã\83³ã\83­ã\83¼ã\83\89ã\81\97ã\81¦ã\81\84ã\82\8bé\96\93ã\81«ã\82¨ã\83©ã\83¼ã\81\8cç\99ºç\94\9fã\81\97ã\81¾ã\81\97ã\81\9fã\80\82"
 
-#: src/gui/dialogs/addon/filter_options.cpp:283
-msgid "addons_view^All Add-ons"
-msgstr "全てのアドオン"
+#: src/gui/dialogs/addon/manager.cpp:497
+msgid "No Add-ons Available"
+msgstr "アドオンはありません"
 
-#: src/gui/dialogs/addon/manager.cpp:236
-msgid "addon_state^Installed, upgradable"
-msgstr "ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«æ¸\88ã\81¿ã\80\81ã\82¢ã\83\83ã\83\97ã\83\87ã\83¼ã\83\88æ\9c\89ã\82\8a"
+#: src/gui/dialogs/addon/manager.cpp:497
+msgid "There are no add-ons available for download from this server."
+msgstr "ã\81\93ã\81®ã\82µã\83¼ã\83\90ã\83¼ã\81\8bã\82\89ã\83\80ã\82¦ã\83³ã\83­ã\83¼ã\83\89å\8f¯è\83½ã\81ªã\82¢ã\83\89ã\82ªã\83³ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"
 
-#: src/gui/dialogs/addon/manager.cpp:236
-msgid "addon_state^Published, upgradable"
-msgstr "公開済み、アップデート有り"
+#: src/gui/dialogs/addon/manager.cpp:672
+msgid ""
+"The following add-on appears to have publishing or version control "
+"information stored locally, and will not be removed:"
+msgstr "以下のアドオンは、アドオンの公開情報やバージョン情報をローカルに保存しています。これらのアドオンはアンインストールされません。"
 
-#: src/gui/dialogs/addon/manager.cpp:240
-msgid "addon_state^Installed, outdated on server"
-msgstr "インストール済み、サーバー上に旧バージョン有り"
+#: src/gui/dialogs/addon/manager.cpp:680
+msgid "The following add-on could not be deleted properly:"
+msgstr "以下のアドオンを正常に削除できませんでした。"
 
-#: src/gui/dialogs/addon/manager.cpp:240
-msgid "addon_state^Published, outdated on server"
-msgstr "å\85¬é\96\8bæ¸\88ã\81¿ã\80\81ã\82µã\83¼ã\83\90ã\83¼ä¸\8aã\81«æ\97§ã\83\90ã\83¼ã\82¸ã\83§ã\83³æ\9c\89ã\82\8a"
+#: src/gui/dialogs/addon/manager.cpp:726
+msgid "Warning"
+msgstr "è­¦å\91\8a"
 
-#: src/gui/dialogs/campaign_settings.cpp:123
+#: src/gui/dialogs/addon/manager.cpp:727
 msgid ""
-"Era:\n"
-"\n"
-"Not allowed."
-msgstr "時代：\n\n許可されていません。"
+"The remote version of this add-on is greater or equal to the version being "
+"uploaded. Do you really wish to continue?"
+msgstr "アップロードされるアドオンのバージョンは、リモートにあるアドオンのバージョン以下の値となっています。 それでも続けますか？"
+
+#: src/gui/dialogs/addon/manager.cpp:736
+msgid "Invalid icon path. Make sure the path points to a valid image."
+msgstr "アイコンのパスが無効です。 有効な画像が存在するパスを指定してください。"
+
+#: src/gui/dialogs/addon/manager.cpp:739 src/gui/dialogs/addon/manager.cpp:742
+#: src/gui/dialogs/addon/manager.cpp:781
+msgid "The server responded with an error:"
+msgstr "サーバーが返したエラー："
+
+#: src/gui/dialogs/addon/manager.cpp:740
+msgid "Terms"
+msgstr "条項"
 
-#: src/gui/dialogs/campaign_settings.cpp:148
+#: src/gui/dialogs/addon/manager.cpp:757 src/gui/dialogs/addon/manager.cpp:784
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:439
+msgid "Response"
+msgstr "応答"
+
+#: src/gui/dialogs/addon/manager.cpp:769
 msgid ""
-"Modifications:\n"
-"\n"
-"None found."
-msgstr "Mod：\n\nModがありません。"
+"Deleting '$addon|' will permanently erase its download and upload counts on "
+"the add-ons server. Do you really wish to continue?"
+msgstr "「$addon|」 を削除するとアドオンサーバー上のダウンロード・アップロード回数も完全に消去されます。 続行しますか？"
+
+#: src/gui/dialogs/addon/manager.cpp:801
+msgid "Do you want to uninstall '$addon|'?"
+msgstr "「$addon|」をアンインストールしますか？"
+
+#: src/gui/dialogs/addon/manager.cpp:885 src/gui/dialogs/addon/manager.cpp:899
+#: src/gui/dialogs/campaign_selection.cpp:274
+#: src/gui/dialogs/multiplayer/lobby.cpp:459
+msgid "None"
+msgstr "なし"
+
+#: src/gui/dialogs/advanced_graphics_options.cpp:75
+msgid "No matching widget found for scaling option"
+msgstr "scaling option にマッチする widget が見つかりません"
+
+#: src/gui/dialogs/attack_predictions.cpp:116
+msgid "No usable weapon"
+msgstr "使用できる武器：無し"
+
+#: src/gui/dialogs/attack_predictions.cpp:188
+msgid "Defender resistance vs"
+msgstr "防御側の耐性："
+
+#: src/gui/dialogs/attack_predictions.cpp:190
+msgid "Attacker vulnerability vs"
+msgstr "攻撃側の弱点："
 
 #: src/gui/dialogs/depcheck_confirm_change.cpp:66
 msgid "$requester requires the following modifications to be enabled:"
@@ -5178,65 +5439,61 @@ msgid ""
 "Please select a compatible one."
 msgstr "現在選択されているModはあなたの設定と両立できません。\n矛盾の無いものを選んで下さい。"
 
-#: src/gui/dialogs/editor/generator_settings.cpp:67
+#: src/gui/dialogs/editor/generator_settings.cpp:71
 msgid "/1000 tiles"
 msgstr "/1000 タイル"
 
-#: src/gui/dialogs/editor/generator_settings.cpp:70
+#: src/gui/dialogs/editor/generator_settings.cpp:74
 msgid "Coastal"
 msgstr "沿岸"
 
-#: src/gui/dialogs/editor/generator_settings.cpp:70
+#: src/gui/dialogs/editor/generator_settings.cpp:74
 msgid "Inland"
 msgstr "内陸"
 
-#: src/gui/dialogs/editor/generator_settings.cpp:70
+#: src/gui/dialogs/editor/generator_settings.cpp:74
 msgid "Island"
 msgstr "島"
 
-#: src/gui/dialogs/file_dialog.cpp:110
+#: src/gui/dialogs/file_dialog.cpp:109
 msgid "Find File"
 msgstr "ファイル探索"
 
-#: src/gui/dialogs/file_dialog.cpp:186
+#: src/gui/dialogs/file_dialog.cpp:185
 msgid "Open"
 msgstr "開く"
 
-#: src/gui/dialogs/file_dialog.cpp:186
-msgid "Save"
-msgstr "保存"
-
-#: src/gui/dialogs/file_dialog.cpp:316
+#: src/gui/dialogs/file_dialog.cpp:306
 msgid "The file already exists. Do you wish to overwrite it?"
 msgstr "ファイルがすでに存在しています。上書きしますか？"
 
-#: src/gui/dialogs/file_dialog.cpp:340
+#: src/gui/dialogs/file_dialog.cpp:330
 msgid "The file or folder $path cannot be created."
 msgstr "ファイル/フォルダ「 $path 」を作成できません。"
 
-#: src/gui/dialogs/file_dialog.cpp:345
+#: src/gui/dialogs/file_dialog.cpp:336
 msgid "The file or folder $path does not exist."
 msgstr "「 $path 」というファイル/フォルダは存在しません。"
 
-#: src/gui/dialogs/file_dialog.cpp:719
+#: src/gui/dialogs/file_dialog.cpp:711
 msgid ""
 "Could not create a new folder at $path|. Make sure you have the appropriate "
 "permissions to write to this location."
 msgstr "フォルダ「$path|」を作成できません。その場所への書き込み権限があるか確認してください。"
 
-#: src/gui/dialogs/file_dialog.cpp:737
+#: src/gui/dialogs/file_dialog.cpp:729
 msgid "The following folder and its contents will be permanently deleted:"
 msgstr "以下のフォルダとその中身は完全に削除されます。"
 
-#: src/gui/dialogs/file_dialog.cpp:738
+#: src/gui/dialogs/file_dialog.cpp:730
 msgid "The following file will be permanently deleted:"
 msgstr "以下のファイルは完全に削除されます。"
 
-#: src/gui/dialogs/file_dialog.cpp:739
+#: src/gui/dialogs/file_dialog.cpp:731
 msgid "Do you wish to continue?"
 msgstr "削除しますか？"
 
-#: src/gui/dialogs/file_dialog.cpp:751
+#: src/gui/dialogs/file_dialog.cpp:743
 msgid ""
 "Could not delete $path|. Make sure you have the appropriate permissions to "
 "write to this location."
@@ -5246,516 +5503,590 @@ msgstr "「 $path| 」を削除できません。その場所への書き込み
 msgid "New Bookmark"
 msgstr "ブックマークの追加"
 
-#: src/gui/dialogs/game_cache_options.cpp:140
+#: src/gui/dialogs/game_cache_options.cpp:137
 msgid "dir_size^Unknown"
 msgstr "不明"
 
-#: src/gui/dialogs/game_cache_options.cpp:142
-#: src/gui/dialogs/network_transmission.cpp:56
-#: src/gui/dialogs/network_transmission.cpp:57
-#: src/gui/dialogs/screenshot_notification.cpp:75
+#: src/gui/dialogs/game_cache_options.cpp:139
+#: src/gui/dialogs/network_transmission.cpp:53
+#: src/gui/dialogs/network_transmission.cpp:54
+#: src/gui/dialogs/screenshot_notification.cpp:142
 msgid "unit_byte^B"
 msgstr "B"
 
-#: src/gui/dialogs/game_cache_options.cpp:165
+#: src/gui/dialogs/game_cache_options.cpp:162
 msgid "Cache Cleaned"
 msgstr "キャッシュのクリーン完了"
 
-#: src/gui/dialogs/game_cache_options.cpp:166
+#: src/gui/dialogs/game_cache_options.cpp:163
 msgid "The game data cache has been cleaned."
 msgstr "ゲームデータのキャッシュをクリーンしました。"
 
-#: src/gui/dialogs/game_cache_options.cpp:169
+#: src/gui/dialogs/game_cache_options.cpp:165
 msgid "The game data cache could not be completely cleaned."
 msgstr "ゲームデータのキャッシュを完全にクリーンできませんでした。"
 
-#: src/gui/dialogs/game_cache_options.cpp:185
+#: src/gui/dialogs/game_cache_options.cpp:181
 msgid "Cache Purged"
 msgstr "キャッシュの削除完了"
 
-#: src/gui/dialogs/game_cache_options.cpp:186
+#: src/gui/dialogs/game_cache_options.cpp:182
 msgid "The game data cache has been purged."
 msgstr "ゲームデータのキャッシュを削除しました。"
 
-#: src/gui/dialogs/game_cache_options.cpp:189
+#: src/gui/dialogs/game_cache_options.cpp:184
 msgid "The game data cache could not be purged."
 msgstr "ゲームデータのキャッシュを削除できませんでした。"
 
-#: src/gui/dialogs/game_load.cpp:283
+#: src/gui/dialogs/game_load.cpp:296
 msgid "(Invalid)"
 msgstr "（無効）"
 
-#: src/gui/dialogs/game_load.cpp:310
+#: src/gui/dialogs/game_load.cpp:323
 msgid "Campaign: $campaign_name"
 msgstr "キャンペーン：$campaign_name"
 
-#: src/gui/dialogs/game_load.cpp:325
+#: src/gui/dialogs/game_load.cpp:338
 msgid "Test scenario"
 msgstr "テストシナリオ"
 
-#: src/gui/dialogs/game_load.cpp:335
+#: src/gui/dialogs/game_load.cpp:348
 msgid "Replay"
 msgstr "リプレイ"
 
-#: src/gui/dialogs/game_load.cpp:337
+#: src/gui/dialogs/game_load.cpp:350
 msgid "Turn"
 msgstr "ターン"
 
-#: src/gui/dialogs/game_load.cpp:339
+#: src/gui/dialogs/game_load.cpp:352
 msgid "Scenario start"
 msgstr "シナリオの開始"
 
-#: src/gui/dialogs/game_load.cpp:342
+#: src/gui/dialogs/game_load.cpp:355
 msgid "Difficulty: "
 msgstr "難易度："
 
-#: src/gui/dialogs/game_load.cpp:346
+#: src/gui/dialogs/game_load.cpp:359
 msgid "Version: "
 msgstr "バージョン："
 
-#: src/gui/dialogs/game_stats.cpp:110 src/gui/dialogs/label_settings.cpp:70
+#: src/gui/dialogs/game_stats.cpp:78
+msgid "controller^AI"
+msgstr "AI"
+
+#: src/gui/dialogs/game_stats.cpp:78
+msgid "controller^Idle"
+msgstr "待機"
+
+#: src/gui/dialogs/game_stats.cpp:114 src/gui/dialogs/label_settings.cpp:71
 msgid "Unknown"
 msgstr "不明"
 
-#: src/gui/dialogs/game_stats.cpp:196 src/gui/dialogs/game_stats.cpp:199
-#: src/gui/dialogs/preferences_dialog.cpp:578
+#: src/gui/dialogs/game_stats.cpp:200 src/gui/dialogs/game_stats.cpp:203
+#: src/gui/dialogs/multiplayer/lobby.cpp:467
 msgid "no"
 msgstr "いいえ"
 
-#: src/gui/dialogs/game_stats.cpp:196 src/gui/dialogs/game_stats.cpp:199
-#: src/gui/dialogs/preferences_dialog.cpp:578
+#: src/gui/dialogs/game_stats.cpp:200 src/gui/dialogs/game_stats.cpp:203
+#: src/gui/dialogs/multiplayer/lobby.cpp:467
 msgid "yes"
 msgstr "はい"
 
-#: src/gui/dialogs/game_version.cpp:139
+#: src/gui/dialogs/game_version.cpp:137
 msgid "Version $version"
 msgstr "バージョン $version"
 
-#: src/gui/dialogs/game_version.cpp:143
+#: src/gui/dialogs/game_version.cpp:141
 msgid "Running on $os"
 msgstr "$os 上で動作中"
 
-#: src/gui/dialogs/game_version.cpp:228
+#: src/gui/dialogs/game_version.cpp:226
 msgid "version^N/A"
 msgstr "N/A"
 
-#: src/gui/dialogs/label_settings.cpp:52
+#: src/gui/dialogs/label_settings.cpp:53
 msgid "Team Labels"
 msgstr "チームラベル"
 
-#: src/gui/dialogs/label_settings.cpp:75
+#: src/gui/dialogs/label_settings.cpp:76
 msgid "Side $side_number ($name)"
 msgstr "陣営 $side_number （ $name ）"
 
-#: src/gui/dialogs/loading_screen.cpp:45
+#: src/gui/dialogs/loading_screen.cpp:50
 msgid "Building terrain rules"
 msgstr "地形ルールの構築"
 
-#: src/gui/dialogs/loading_screen.cpp:46
+#: src/gui/dialogs/loading_screen.cpp:51
 msgid "Reading files and creating cache"
 msgstr "ファイルの読込み、キャッシュの作成"
 
-#: src/gui/dialogs/loading_screen.cpp:47 src/gui/dialogs/loading_screen.cpp:50
+#: src/gui/dialogs/loading_screen.cpp:52 src/gui/dialogs/loading_screen.cpp:55
 msgid "Initializing display"
 msgstr "表示の初期化"
 
-#: src/gui/dialogs/loading_screen.cpp:48
+#: src/gui/dialogs/loading_screen.cpp:53
 msgid "Reinitialize fonts for the current language"
 msgstr "現在の言語向けにフォントを再初期化"
 
-#: src/gui/dialogs/loading_screen.cpp:49
+#: src/gui/dialogs/loading_screen.cpp:54
 msgid "Initializing teams"
 msgstr "チームの初期化"
 
-#: src/gui/dialogs/loading_screen.cpp:51
+#: src/gui/dialogs/loading_screen.cpp:56
 msgid "Loading game configuration"
 msgstr "ゲーム設定の読込み"
 
-#: src/gui/dialogs/loading_screen.cpp:52
+#: src/gui/dialogs/loading_screen.cpp:57
 msgid "Loading data files"
 msgstr "データファイルの読込み"
 
-#: src/gui/dialogs/loading_screen.cpp:53
+#: src/gui/dialogs/loading_screen.cpp:58
 msgid "Loading level"
 msgstr "レベルの読込み"
 
-#: src/gui/dialogs/loading_screen.cpp:54
+#: src/gui/dialogs/loading_screen.cpp:59
 msgid "Initializing scripting engine"
 msgstr "スクリプトエンジンの初期化"
 
-#: src/gui/dialogs/loading_screen.cpp:55
+#: src/gui/dialogs/loading_screen.cpp:60
 msgid "Initializing planning mode"
 msgstr "計画モードの初期化"
 
-#: src/gui/dialogs/loading_screen.cpp:56
+#: src/gui/dialogs/loading_screen.cpp:61
 msgid "Reading unit files"
 msgstr "ユニットのファイルを読込み"
 
-#: src/gui/dialogs/loading_screen.cpp:57
+#: src/gui/dialogs/loading_screen.cpp:62
 msgid "Loading units"
 msgstr "ユニットの読込み"
 
-#: src/gui/dialogs/loading_screen.cpp:58
+#: src/gui/dialogs/loading_screen.cpp:63
 msgid "Searching for installed add-ons"
 msgstr "インストール済みアドオンを検索中"
 
-#: src/gui/dialogs/loading_screen.cpp:59
+#: src/gui/dialogs/loading_screen.cpp:64
 msgid "Starting game"
 msgstr "ゲーム開始"
 
-#: src/gui/dialogs/loading_screen.cpp:60
+#: src/gui/dialogs/loading_screen.cpp:65
 msgid "Verifying cache"
 msgstr "キャッシュの検証"
 
-#: src/gui/dialogs/loading_screen.cpp:61
+#: src/gui/dialogs/loading_screen.cpp:66
 msgid "Connecting to server"
 msgstr "サーバーへ接続中"
 
-#: src/gui/dialogs/loading_screen.cpp:62
+#: src/gui/dialogs/loading_screen.cpp:67
 msgid "Logging in"
 msgstr "ログイン中"
 
-#: src/gui/dialogs/loading_screen.cpp:63
+#: src/gui/dialogs/loading_screen.cpp:68
 msgid "Waiting for server"
 msgstr "サーバーを待機中"
 
-#: src/gui/dialogs/loading_screen.cpp:64
+#: src/gui/dialogs/loading_screen.cpp:69
 msgid "Connecting to redirected server"
 msgstr "リダイレクトされたサーバーへ接続中"
 
-#: src/gui/dialogs/loading_screen.cpp:65
+#: src/gui/dialogs/loading_screen.cpp:70
 msgid "Waiting for next scenario"
 msgstr "次のシナリオを待機中"
 
-#: src/gui/dialogs/loading_screen.cpp:66
+#: src/gui/dialogs/loading_screen.cpp:71
 msgid "Getting game data"
 msgstr "ゲームデータの取得中"
 
-#: src/gui/dialogs/lobby/lobby.cpp:105
+#: src/gui/dialogs/loading_screen.cpp:72
+msgid "Downloading lobby data"
+msgstr "ロビーデータをダウンロード中"
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:104
 msgid "Selected Game"
 msgstr "選択中のゲーム"
 
-#: src/gui/dialogs/lobby/lobby.cpp:106
+#: src/gui/dialogs/multiplayer/lobby.cpp:105
 msgid "Other Games"
 msgstr "他のゲーム"
 
-#: src/gui/dialogs/lobby/lobby.cpp:107
+#: src/gui/dialogs/multiplayer/lobby.cpp:107
 msgid "Current Room"
 msgstr "現在の部屋"
 
-#: src/gui/dialogs/lobby/lobby.cpp:108
+#: src/gui/dialogs/multiplayer/lobby.cpp:109
 msgid "Lobby"
 msgstr "ロビー"
 
-#: src/gui/dialogs/lobby/lobby.cpp:124
+#: src/gui/dialogs/multiplayer/lobby.cpp:125
 msgid "Do you really want to log out?"
 msgstr "ログアウトしますか？"
 
-#: src/gui/dialogs/lobby/lobby.cpp:392
-msgid "Games: showing $num_shown out of $num_total"
-msgstr "ゲーム： $num_total 中の $num_shown を表示"
-
-#: src/gui/dialogs/lobby/lobby.cpp:434
-msgid "Observers allowed"
-msgstr "観戦可"
-
-#: src/gui/dialogs/lobby/lobby.cpp:437
-msgid "Observers not allowed"
-msgstr "観戦不可"
-
-#: src/gui/dialogs/lobby/lobby.cpp:901
+#: src/gui/dialogs/multiplayer/lobby.cpp:224
 msgid "Incompatible User-made Content."
 msgstr "非互換のユーザーメイドコンテンツ（UMC）があります。"
 
-#: src/gui/dialogs/lobby/lobby.cpp:902
+#: src/gui/dialogs/multiplayer/lobby.cpp:225
 msgid ""
 "This game cannot be joined because the host has out-of-date add-ons that are"
 " incompatible with your version. You might wish to suggest that the host's "
 "add-ons be updated."
 msgstr "ホストが互換性の無い古いバージョンのアドオンを使用しており、このゲームに参加することはできません。ホストにアドオンをアップデートするよう促した方が良いかもしれません。"
 
-#: src/gui/dialogs/lobby/lobby.cpp:917
+#: src/gui/dialogs/multiplayer/lobby.cpp:240
 msgid "Missing User-made Content."
 msgstr "未所持のユーザーメイドコンテンツ（UMC）があります。"
 
-#: src/gui/dialogs/lobby/lobby.cpp:918
+#: src/gui/dialogs/multiplayer/lobby.cpp:241
 msgid ""
 "This game requires one or more user-made addons to be installed or updated in order to join.\n"
 "Do you want to try to install them?"
 msgstr "このゲームをプレイするには、いくつかのアドオンをインストールまたはアップデートする必要があります。それらのアドオンをインストールしますか？"
 
-#: src/gui/dialogs/lobby/lobby.cpp:973
+#: src/gui/dialogs/multiplayer/lobby.cpp:407
+msgid "Games: showing $num_shown out of $num_total"
+msgstr "ゲーム： $num_total 中の $num_shown を表示"
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:452
+msgid "Era:"
+msgstr "時代："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:469
+msgid "Settings:"
+msgstr "設定："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:473
+msgid "Registered users only:"
+msgstr "登録ユーザーのみ："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:474
+msgid "Reloaded:"
+msgstr "再開："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:475
+msgid "Shared vision:"
+msgstr "共有された視界："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:476
+msgid "Shuffle sides:"
+msgstr "陣営をシャッフル："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:477
+msgid "Time limit:"
+msgstr "制限時間："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:478
+msgid "Use map settings:"
+msgstr "マップ設定を使用："
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:486
+msgid ""
+"One or more items need to be installed\n"
+"in order to join this game."
+msgstr "このゲームに参加するには、１つあるいは複数のアイテムをインストールする必要があります。"
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:511
+msgid "Observers allowed"
+msgstr "観戦可"
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:514
+msgid "Observers not allowed"
+msgstr "観戦不可"
+
+#: src/gui/dialogs/multiplayer/lobby.cpp:957
 msgid ""
 "Something is wrong with the addon version check database supporting the "
 "multiplayer lobby. Please report this at http://bugs.wesnoth.org."
 msgstr "マルチプレイヤーロビーのアドオンバージョンチェックデータベースに何らかの不具合があったようです。bugs.wesnoth.orgにバグ報告をお願いします。"
 
-#: src/gui/dialogs/multiplayer/mp_alerts_options.cpp:135
+#: src/gui/dialogs/multiplayer/mp_alerts_options.cpp:131
 msgid ""
 "This build of wesnoth does not include support for desktop notifications, "
 "contact your package manager"
 msgstr "このwesnothのビルドにはデスクトップ通知機能が含まれていません。パッケージャーに連絡してください。"
 
-#: src/gui/dialogs/multiplayer/mp_change_control.cpp:252
+#: src/gui/dialogs/multiplayer/mp_change_control.cpp:108
 msgid "Side $side"
 msgstr "陣営 $side"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:97
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:108
 msgid "Scenarios"
 msgstr "シナリオ"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:99
-msgid "User Maps"
-msgstr "ã\83¦ã\83¼ã\82¶ã\83¼ã\83\9eã\83\83ã\83\97"
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:109
+msgid "Multiplayer Campaigns"
+msgstr "ã\83\9eã\83«ã\83\81ã\83\97ã\83¬ã\82¤ã\83¤ã\83¼ã\82­ã\83£ã\83³ã\83\9aã\83¼ã\83³"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:100
-msgid "User Scenarios"
-msgstr "ユーザーシナリオ"
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:110
+msgid "Singleplayer Campaigns"
+msgstr "１人用キャンペーン"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:101
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:111
+msgid "Custom Maps"
+msgstr "カスタムマップ"
+
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:112
+msgid "Custom Scenarios"
+msgstr "カスタムシナリオ"
+
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:113
 msgid "Random Maps"
 msgstr "ランダムマップ"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:105
-msgid "SP Campaigns"
-msgstr "SP キャンペーン"
-
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:179
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:180
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:187
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:188
 msgid "No games found."
 msgstr "ゲームが存在しません。"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:212
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:253
 msgid "No eras found."
 msgstr "時代が存在しません。"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:213
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:254
 msgid "No eras found"
 msgstr "時代が存在しません"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:279
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:276
 msgid "Independent: Random factions assigned independently"
 msgstr "完全ランダム：陣営の党派をランダムに決定します。ミラーマッチが起こる可能性もあります。"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:280
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:277
 msgid "No Mirror: No two players will get the same faction"
 msgstr "ミラーマッチ防止：ミラーマッチ（2人以上のプレイヤーが同じ党派）にならないようにします。"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:281
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:278
 msgid "No Ally Mirror: No two allied players will get the same faction"
 msgstr "同名ミラー防止：同盟関係にある陣営の党派が被らないようにします。"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:461
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:532
 msgid "No eras available for this game."
 msgstr "このゲームには時代を適用できません。"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:512
-msgid "No description available"
-msgstr "説明はありません。"
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:826
+msgid "The selected game has no sides!"
+msgstr "選択したゲームには陣営がありません！"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:786
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:892
 msgid "Choose Starting Scenario"
 msgstr "開始シナリオの選択"
 
-#: src/gui/dialogs/multiplayer/mp_create_game.cpp:786
+#: src/gui/dialogs/multiplayer/mp_create_game.cpp:892
 msgid "Select at which point to begin this campaign."
 msgstr "どこからキャンペーンを開始しますか？"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:185
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:193
 msgid "No era information found."
 msgstr "時代の情報が見つかりません。"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:240
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:248
 msgid "Computer Player"
 msgstr "コンピュータープレイヤー"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:242
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:250
 msgid "Empty slot"
 msgstr "空席"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:244
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:252
 msgid "Reserved for $playername"
 msgstr "（ $playername が予約済み）"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:246
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:254
 msgid "Vacant slot"
 msgstr "空席"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:250
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:258
 msgid "empty"
 msgstr "空"
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:327
-#: src/gui/dialogs/multiplayer/mp_staging.cpp:158
+#: src/gui/dialogs/multiplayer/mp_join_game.cpp:332
+#: src/gui/dialogs/multiplayer/mp_staging.cpp:154
 msgid "Team:"
 msgstr "チーム："
 
-#: src/gui/dialogs/multiplayer/mp_join_game.cpp:452
-msgid "Response"
-msgstr "応答"
-
-#: src/gui/dialogs/multiplayer/mp_staging.cpp:434
+#: src/gui/dialogs/multiplayer/mp_staging.cpp:464
 msgid "Waiting for players to choose factions..."
 msgstr "プレイヤーが党派を選択中..."
 
-#: src/gui/dialogs/preferences_dialog.cpp:126
-msgid "friend"
-msgstr "友人"
-
-#: src/gui/dialogs/preferences_dialog.cpp:131
-msgid "ignored"
-msgstr "無視"
-
-#: src/gui/dialogs/preferences_dialog.cpp:185
-#: src/gui/dialogs/preferences_dialog.cpp:221
-msgid "No username specified"
-msgstr "ユーザー名が指定されていません"
-
-#: src/gui/dialogs/preferences_dialog.cpp:199
-msgid "Invalid username"
-msgstr "無効なユーザ名です。"
-
-#: src/gui/dialogs/preferences_dialog.cpp:226
-msgid "Not on friends or ignore lists"
-msgstr "友人・無視リストに含まれていません"
+#: src/gui/dialogs/outro.cpp:42
+msgid "The End"
+msgstr "完"
 
-#: src/gui/dialogs/preferences_dialog.cpp:689
+#: src/gui/dialogs/preferences_dialog.cpp:140
 msgid "Saved Games"
 msgstr "ゲームの保存"
 
-#: src/gui/dialogs/preferences_dialog.cpp:690
+#: src/gui/dialogs/preferences_dialog.cpp:141
 msgid "Map Commands"
 msgstr "マップコマンド"
 
-#: src/gui/dialogs/preferences_dialog.cpp:691
+#: src/gui/dialogs/preferences_dialog.cpp:142
 msgid "Unit Commands"
 msgstr "ユニットコマンド"
 
-#: src/gui/dialogs/preferences_dialog.cpp:692
+#: src/gui/dialogs/preferences_dialog.cpp:143
 msgid "Player Chat"
 msgstr "プレイヤーチャット"
 
-#: src/gui/dialogs/preferences_dialog.cpp:693
+#: src/gui/dialogs/preferences_dialog.cpp:144
 msgid "Replay Control"
 msgstr "リプレイコントロール"
 
-#: src/gui/dialogs/preferences_dialog.cpp:694
+#: src/gui/dialogs/preferences_dialog.cpp:145
 msgid "Planning Mode"
 msgstr "計画モード"
 
-#: src/gui/dialogs/preferences_dialog.cpp:695
+#: src/gui/dialogs/preferences_dialog.cpp:146
 msgid "Scenario Editor"
 msgstr "シナリオエディタ"
 
-#: src/gui/dialogs/preferences_dialog.cpp:696
+#: src/gui/dialogs/preferences_dialog.cpp:147
 msgid "Editor Palettes"
 msgstr "エディタのパレット"
 
-#: src/gui/dialogs/preferences_dialog.cpp:697
+#: src/gui/dialogs/preferences_dialog.cpp:148
 msgid "Editor Tools"
 msgstr "エディタのツール"
 
-#: src/gui/dialogs/preferences_dialog.cpp:698
+#: src/gui/dialogs/preferences_dialog.cpp:149
 msgid "Editor Clipboard"
 msgstr "エディタのクリップボード"
 
-#: src/gui/dialogs/preferences_dialog.cpp:699
+#: src/gui/dialogs/preferences_dialog.cpp:150
 msgid "Debug Commands"
 msgstr "デバッグコマンド"
 
-#: src/gui/dialogs/preferences_dialog.cpp:700
+#: src/gui/dialogs/preferences_dialog.cpp:151
 msgid "Custom WML Commands"
 msgstr "カスタムWMLコマンド"
 
-#: src/gui/dialogs/preferences_dialog.cpp:788
+#: src/gui/dialogs/preferences_dialog.cpp:190
+msgid "friend"
+msgstr "友人"
+
+#: src/gui/dialogs/preferences_dialog.cpp:195
+msgid "ignored"
+msgstr "無視"
+
+#: src/gui/dialogs/preferences_dialog.cpp:249
+#: src/gui/dialogs/preferences_dialog.cpp:309
+msgid "No username specified"
+msgstr "ユーザー名が指定されていません"
+
+#: src/gui/dialogs/preferences_dialog.cpp:267
+msgid "Invalid username"
+msgstr "無効なユーザ名です。"
+
+#: src/gui/dialogs/preferences_dialog.cpp:314
+msgid "Not on friends or ignore lists"
+msgstr "友人・無視リストに含まれていません"
+
+#: src/gui/dialogs/preferences_dialog.cpp:814
 msgid "&#9679;"
 msgstr "&#9679;"
 
-#: src/gui/dialogs/preferences_dialog.cpp:843
+#: src/gui/dialogs/preferences_dialog.cpp:874
 msgid ""
 "“<b>$hotkey_sequence|</b>” is in use by “<b>$old_hotkey_action|</b>”.\n"
 "Do you wish to reassign it to “<b>$new_hotkey_action|</b>”?"
 msgstr "「<b>$hotkey_sequence|</b>」は 「<b>$old_hotkey_action|</b>」に割り当てられています。\n割り当てを「<b>$new_hotkey_action|</b>」に変更しますか？"
 
-#: src/gui/dialogs/preferences_dialog.cpp:849
+#: src/gui/dialogs/preferences_dialog.cpp:880
 msgid "Reassign Hotkey"
 msgstr "ホットキーの再割り当て"
 
-#: src/gui/dialogs/preferences_dialog.cpp:866
+#: src/gui/dialogs/preferences_dialog.cpp:897
 msgid "All hotkeys have been reset to their default values."
 msgstr "全てのホットキーはデフォルトの値にリセットされます。"
 
-#: src/gui/dialogs/preferences_dialog.cpp:866
+#: src/gui/dialogs/preferences_dialog.cpp:897
 msgid "Hotkeys Reset"
 msgstr "ホットキーのリセット"
 
-#: src/gui/dialogs/preferences_dialog.cpp:954
+#: src/gui/dialogs/preferences_dialog.cpp:1005
 msgid "∞"
 msgstr "無限"
 
-#: src/gui/dialogs/screenshot_notification.cpp:76
-msgid "file_size^Unknown"
-msgstr "不明"
-
-#: src/gui/dialogs/statistics_dialog.cpp:194
+#: src/gui/dialogs/statistics_dialog.cpp:185
 msgid "Recruits"
-msgstr ""
+msgstr "雇用"
 
-#: src/gui/dialogs/statistics_dialog.cpp:195
+#: src/gui/dialogs/statistics_dialog.cpp:186
 msgid "Recalls"
-msgstr ""
+msgstr "召還"
 
-#: src/gui/dialogs/statistics_dialog.cpp:196
+#: src/gui/dialogs/statistics_dialog.cpp:187
 msgid "Advancements"
-msgstr ""
+msgstr "レベルアップ"
 
-#: src/gui/dialogs/statistics_dialog.cpp:197
+#: src/gui/dialogs/statistics_dialog.cpp:188
 msgid "Losses"
-msgstr ""
+msgstr "損失"
 
-#: src/gui/dialogs/statistics_dialog.cpp:198
+#: src/gui/dialogs/statistics_dialog.cpp:189
 msgid "Kills"
-msgstr ""
+msgstr "撃破"
 
-#: src/gui/dialogs/statistics_dialog.cpp:212
+#: src/gui/dialogs/statistics_dialog.cpp:203
 msgid "Inflicted"
-msgstr ""
+msgstr "与ダメージ"
 
-#: src/gui/dialogs/statistics_dialog.cpp:220
+#: src/gui/dialogs/statistics_dialog.cpp:211
 msgid "Taken"
-msgstr ""
+msgstr "被ダメージ"
 
-#: src/gui/dialogs/unit_attack.cpp:99
-msgid "Damage Calculations"
-msgstr "ã\83\80ã\83¡ã\83¼ã\82¸è¨\88ç®\97"
+#: src/gui/dialogs/title_screen.cpp:468
+msgid "Choose Test"
+msgstr "ã\83\86ã\82¹ã\83\88ã\81®é\81¸æ\8a\9e"
 
-#: src/gui/dialogs/unit_recall.cpp:264
+#: src/gui/dialogs/unit_recall.cpp:265
 msgid "This unit is loyal and requires no upkeep."
 msgstr "忠義ユニットには維持費が必要ありません。"
 
-#: src/gui/dialogs/unit_recall.cpp:265 src/gui/dialogs/unit_recall.cpp:270
-#: src/gui/dialogs/unit_recall.cpp:275
+#: src/gui/dialogs/unit_recall.cpp:266 src/gui/dialogs/unit_recall.cpp:271
+#: src/gui/dialogs/unit_recall.cpp:276
 msgid "Do you really want to dismiss him?"
 msgstr "本当に彼を解雇しますか？"
 
-#: src/gui/dialogs/unit_recall.cpp:266 src/gui/dialogs/unit_recall.cpp:271
-#: src/gui/dialogs/unit_recall.cpp:276
+#: src/gui/dialogs/unit_recall.cpp:267 src/gui/dialogs/unit_recall.cpp:272
+#: src/gui/dialogs/unit_recall.cpp:277
 msgid "Do you really want to dismiss her?"
 msgstr "本当に彼女を解雇しますか？"
 
-#: src/gui/dialogs/unit_recall.cpp:269
+#: src/gui/dialogs/unit_recall.cpp:270
 msgid "This unit is an experienced one, having advanced levels."
 msgstr "このユニットは熟練しており、高レベルです。"
 
-#: src/gui/dialogs/unit_recall.cpp:274
+#: src/gui/dialogs/unit_recall.cpp:275
 msgid "This unit is close to advancing a level."
 msgstr "レベルアップが近いユニットです。"
 
-#: src/gui/dialogs/unit_recall.cpp:280
+#: src/gui/dialogs/unit_recall.cpp:281
 msgid "Dismiss Unit"
 msgstr "ユニットの解雇"
 
-#: src/gui/widgets/chatbox.cpp:265
+#: src/gui/gui.cpp:84
+msgid "No default gui defined."
+msgstr "デフォルトの GUI が定義されていません。"
+
+#: src/gui/widgets/addon_list.cpp:118
+msgid "addon_state^Installed, upgradable"
+msgstr "インストール済み、アップデート有り"
+
+#: src/gui/widgets/addon_list.cpp:118
+msgid "addon_state^Published, upgradable"
+msgstr "公開済み、アップデート有り"
+
+#: src/gui/widgets/addon_list.cpp:122
+msgid "addon_state^Installed, outdated on server"
+msgstr "インストール済み、サーバー上に旧バージョン有り"
+
+#: src/gui/widgets/addon_list.cpp:122
+msgid "addon_state^Published, outdated on server"
+msgstr "公開済み、サーバー上に旧バージョン有り"
+
+#: src/gui/widgets/addon_list.cpp:285
+msgid "Delete add-on from server"
+msgstr "サーバーからアドオンを削除します"
+
+#: src/gui/widgets/chatbox.cpp:263
 msgid "whisper to $receiver"
 msgstr "$receiver にささやく"
 
@@ -5769,926 +6100,944 @@ msgstr "<i>「 $name 」</i>とのささやきが開始されました。この
 msgid "Room <i>“$name”</i> joined"
 msgstr "部屋「 $name 」に参加しました。"
 
-#: src/gui/widgets/chatbox.cpp:590
+#: src/gui/widgets/chatbox.cpp:597
 msgid "$player has entered the room"
 msgstr "$player が入室しました"
 
-#: src/gui/widgets/chatbox.cpp:629
+#: src/gui/widgets/chatbox.cpp:639
 msgid "$player has left the room"
 msgstr "$player が退室しました"
 
-#: src/gui/widgets/helper.cpp:115
+#: src/gui/widgets/helper.cpp:96
 msgid "Mandatory widget '$id' hasn't been defined."
 msgstr "必須widget 「 $id 」が定義されていません。"
 
-#: src/gui/widgets/label.cpp:161
+#: src/gui/widgets/label.cpp:153
 msgid "Opening links is not supported, contact your packager"
 msgstr "リンクを開く機能がサポートされていません。パッケージャーに連絡してください。"
 
-#: src/gui/widgets/label.cpp:180
+#: src/gui/widgets/label.cpp:172
 msgid "Do you want to open this link?"
 msgstr "このリンクを開きますか？"
 
-#: src/gui/widgets/label.cpp:211
+#: src/gui/widgets/label.cpp:203
 msgid "Copied link!"
 msgstr "リンクをコピーしました！"
 
-#: src/gui/widgets/listbox.cpp:915 src/gui/widgets/multi_page.cpp:299
+#: src/gui/widgets/listbox.cpp:929 src/gui/widgets/multi_page.cpp:282
 msgid ""
 "'list_data' must have the same number of columns as the 'list_definition'."
 msgstr "「 list_data 」には「 list_definition 」と同じ数のcolumnがなければなりません。"
 
-#: src/gui/widgets/listbox.cpp:959 src/gui/widgets/listbox.cpp:1112
-#: src/gui/widgets/listbox.cpp:1237 src/gui/widgets/scrollbar_panel.cpp:148
+#: src/gui/widgets/listbox.cpp:973 src/gui/widgets/listbox.cpp:1090
+#: src/gui/widgets/listbox.cpp:1207 src/gui/widgets/scrollbar_panel.cpp:147
 msgid "No list defined."
 msgstr "listが定義されていません。"
 
-#: src/gui/widgets/listbox.cpp:963 src/gui/widgets/listbox.cpp:1116
-#: src/gui/widgets/listbox.cpp:1241
+#: src/gui/widgets/listbox.cpp:978 src/gui/widgets/listbox.cpp:1095
+#: src/gui/widgets/listbox.cpp:1212
 msgid "A 'list_definition' should contain one row."
 msgstr "「 list_definition 」には単一のrowを含む必要があります。"
 
-#: src/gui/widgets/multi_page.cpp:274
+#: src/gui/widgets/multi_page.cpp:258
 msgid "No page defined."
 msgstr "pageが定義されていません。"
 
-#: src/gui/widgets/pane.cpp:431
-msgid "Need at least 1 parallel item."
-msgstr "å°\91ã\81ªã\81\8fã\81¨ã\82\821ã\81¤ã\81®parallel itemã\81\8cå¿\85è¦\81ã\81§ã\81\99ã\80\82"
+#: src/gui/widgets/multimenu_button.cpp:175
+msgid "multimenu^All Selected"
+msgstr "å\85¨ã\81¦é\81¸æ\8a\9eæ¸\88ã\81¿"
 
-#: src/gui/widgets/settings.cpp:454
-msgid ""
-"Widget definition '$definition' doesn't contain the definition for '$id'."
-msgstr "widget定義「 $definition 」が「 $id 」の定義を含んでいません。"
+#: src/gui/widgets/multimenu_button.cpp:180
+msgid "multimenu^$excess other"
+msgid_plural "$excess others"
+msgstr[0] "他 $excess"
 
-#: src/gui/widgets/settings.cpp:534
-msgid "No default gui defined."
-msgstr "デフォルトの GUI が定義されていません。"
+#: src/gui/widgets/multimenu_button.cpp:182
+#: src/gui/widgets/multimenu_button.cpp:239
+msgid "multimenu^None Selected"
+msgstr "未選択"
 
-#: src/gui/widgets/settings.cpp:568
-msgid "No state or draw section defined."
-msgstr "stateもしくはdraw sectionがひとつも設定されていません。"
+#: src/gui/widgets/pane.cpp:429
+msgid "Need at least 1 parallel item."
+msgstr "少なくとも1つのparallel itemが必要です。"
 
-#: src/gui/widgets/size_lock.cpp:134
+#: src/gui/widgets/size_lock.cpp:154
 msgid "No widget defined."
-msgstr ""
+msgstr "widget が定義されていません。"
 
-#: src/gui/widgets/size_lock.cpp:157
+#: src/gui/widgets/size_lock.cpp:175
 msgid "Invalid size."
-msgstr ""
+msgstr "無効なサイズです。"
 
-#: src/gui/widgets/slider.cpp:511
+#: src/gui/widgets/slider.cpp:453
 msgid "The number of value_labels and values don't match."
 msgstr "value_labels と values の数が合いません。"
 
-#: src/gui/widgets/stacked_widget.cpp:237
+#: src/gui/widgets/stacked_widget.cpp:278
 msgid "No stack layers defined."
 msgstr "stack layerが定義されていません。"
 
-#: src/gui/widgets/styled_widget.cpp:665
+#: src/gui/widgets/styled_widget.cpp:667
 msgid "Found a widget with a helptip and without a tooltip."
 msgstr "helptipがあるのにtooltipの無いwidgetが見つかりました。"
 
-#: src/gui/widgets/tree_view.cpp:390
+#: src/gui/widgets/tree_view.cpp:389
 msgid "No nodes defined for a tree view."
 msgstr "tree viewのためのnodeが定義されていません。"
 
-#: src/gui/widgets/tree_view.cpp:430
+#: src/gui/widgets/tree_view.cpp:425
 msgid "[node]id 'root' is reserved for the implementation."
 msgstr "[node]id「root」は実装のために予約されています。"
 
-#: src/gui/widgets/tree_view.cpp:434
+#: src/gui/widgets/tree_view.cpp:429
 msgid "No node defined."
 msgstr "nodeが定義されていません。"
 
-#: src/gui/widgets/tree_view_node.cpp:115
+#: src/gui/widgets/tree_view_node.cpp:112
 msgid "Unknown builder id for tree view node."
 msgstr "tree view nodeのbuilder idが不明です。"
 
-#: src/gui/widgets/unit_preview_pane.cpp:116
+#: src/gui/widgets/unit_preview_pane.cpp:133
+msgid "Resistances: "
+msgstr "耐性："
+
+#: src/gui/widgets/unit_preview_pane.cpp:135
+msgid "(Att / Def)"
+msgstr "（攻撃時 / 防御時）"
+
+#: src/gui/widgets/unit_preview_pane.cpp:148
+msgid "Movement Costs:"
+msgstr "移動コスト："
+
+#: src/gui/widgets/unit_preview_pane.cpp:211
 msgid "Attacks"
 msgstr "攻撃"
 
-#: src/gui/widgets/unit_preview_pane.cpp:139
-msgid "Weapon special: "
-msgstr "特殊武器："
-
-#: src/gui/widgets/unit_preview_pane.cpp:170
-#: src/gui/widgets/unit_preview_pane.cpp:297
+#: src/gui/widgets/unit_preview_pane.cpp:264
+#: src/gui/widgets/unit_preview_pane.cpp:294
+#: src/gui/widgets/unit_preview_pane.cpp:415
+#: src/gui/widgets/unit_preview_pane.cpp:446
 msgid "Lvl $lvl"
 msgstr "レベル $lvl"
 
-#: src/gui/widgets/unit_preview_pane.cpp:198
-#: src/gui/widgets/unit_preview_pane.cpp:335
-#: src/gui/widgets/unit_preview_pane.cpp:349
+#: src/gui/widgets/unit_preview_pane.cpp:301
+#: src/gui/widgets/unit_preview_pane.cpp:314
+#: src/gui/widgets/unit_preview_pane.cpp:454
+#: src/gui/widgets/unit_preview_pane.cpp:467
 msgid "HP: "
 msgstr "HP："
 
-#: src/gui/widgets/unit_preview_pane.cpp:201
-#: src/gui/widgets/unit_preview_pane.cpp:338
-#: src/gui/widgets/unit_preview_pane.cpp:352
+#: src/gui/widgets/unit_preview_pane.cpp:303
+#: src/gui/widgets/unit_preview_pane.cpp:319
+#: src/gui/widgets/unit_preview_pane.cpp:457
+#: src/gui/widgets/unit_preview_pane.cpp:472
 msgid "XP: "
 msgstr "XP："
 
-#: src/gui/widgets/unit_preview_pane.cpp:203
-#: src/gui/widgets/unit_preview_pane.cpp:354
+#: src/gui/widgets/unit_preview_pane.cpp:321
+#: src/gui/widgets/unit_preview_pane.cpp:474
+msgid "Experience Modifier: "
+msgstr "必要経験値の変更（%）："
+
+#: src/gui/widgets/unit_preview_pane.cpp:324
+#: src/gui/widgets/unit_preview_pane.cpp:477
 msgid "MP: "
 msgstr "MP："
 
-#: src/gui/widgets/unit_preview_pane.cpp:246
-#: src/gui/widgets/unit_preview_pane.cpp:388
+#: src/gui/widgets/unit_preview_pane.cpp:362
+#: src/gui/widgets/unit_preview_pane.cpp:505
 msgid "Abilities"
 msgstr "能力"
 
-#: src/gui/widgets/window.cpp:1015
+#: src/gui/widgets/window.cpp:939
 msgid "Click dismiss needs a 'click_dismiss' or 'ok' button."
 msgstr "Click dismissには「 click_dismiss 」または「 ok 」ボタンが必要です。"
 
-#: src/gui/widgets/window.cpp:1040 src/gui/widgets/window.cpp:1077
-#: src/tests/gui/test_gui2.cpp:526
+#: src/gui/widgets/window.cpp:964 src/gui/widgets/window.cpp:1001
+#: src/tests/gui/test_gui2.cpp:569
 msgid "Failed to show a dialog, which doesn't fit on the screen."
 msgstr "画面に合わないため、ダイアログの表示に失敗しました。"
 
-#: src/hotkey/hotkey_command.cpp:39
+#: src/hotkey/hotkey_command.cpp:50
 msgid "Scroll Up"
 msgstr "上にスクロール"
 
-#: src/hotkey/hotkey_command.cpp:40
+#: src/hotkey/hotkey_command.cpp:51
 msgid "Scroll Down"
 msgstr "下にスクロール"
 
-#: src/hotkey/hotkey_command.cpp:41
+#: src/hotkey/hotkey_command.cpp:52
 msgid "Scroll Left"
 msgstr "左にスクロール"
 
-#: src/hotkey/hotkey_command.cpp:42
+#: src/hotkey/hotkey_command.cpp:53
 msgid "Scroll Right"
 msgstr "右にスクロール"
 
-#: src/hotkey/hotkey_command.cpp:44
+#: src/hotkey/hotkey_command.cpp:55
 msgid "cancel"
 msgstr "キャンセル"
 
-#: src/hotkey/hotkey_command.cpp:45
+#: src/hotkey/hotkey_command.cpp:56
 msgid "Select Hex"
 msgstr "ヘクス選択"
 
-#: src/hotkey/hotkey_command.cpp:46
+#: src/hotkey/hotkey_command.cpp:57
 msgid "Deselect Hex"
 msgstr "ヘクス選択解除"
 
-#: src/hotkey/hotkey_command.cpp:47
+#: src/hotkey/hotkey_command.cpp:58
 msgid "Move/Attack"
 msgstr "移動/攻撃"
 
-#: src/hotkey/hotkey_command.cpp:48
+#: src/hotkey/hotkey_command.cpp:59
 msgid "Select/Move/Attack"
 msgstr "選択/移動/攻撃"
 
-#: src/hotkey/hotkey_command.cpp:49
+#: src/hotkey/hotkey_command.cpp:60
 msgid "Animate Map"
 msgstr "マップのアニメーション"
 
-#: src/hotkey/hotkey_command.cpp:50
+#: src/hotkey/hotkey_command.cpp:61
 msgid "Next Unit"
 msgstr "次のユニット"
 
-#: src/hotkey/hotkey_command.cpp:51
+#: src/hotkey/hotkey_command.cpp:62
 msgid "Previous Unit"
 msgstr "前のユニット"
 
-#: src/hotkey/hotkey_command.cpp:52
+#: src/hotkey/hotkey_command.cpp:63
 msgid "Hold Position"
 msgstr "位置を保持"
 
-#: src/hotkey/hotkey_command.cpp:53
+#: src/hotkey/hotkey_command.cpp:64
 msgid "End Unit Turn"
 msgstr "ユニットのターンを終了"
 
-#: src/hotkey/hotkey_command.cpp:55
+#: src/hotkey/hotkey_command.cpp:66
 msgid "Undo"
 msgstr "アンドゥ"
 
-#: src/hotkey/hotkey_command.cpp:56
+#: src/hotkey/hotkey_command.cpp:67
 msgid "Redo"
 msgstr "リドゥ"
 
-#: src/hotkey/hotkey_command.cpp:57
+#: src/hotkey/hotkey_command.cpp:68
 msgid "Zoom In"
 msgstr "ズームイン"
 
-#: src/hotkey/hotkey_command.cpp:58
+#: src/hotkey/hotkey_command.cpp:69
 msgid "Zoom Out"
 msgstr "ズームアウト"
 
-#: src/hotkey/hotkey_command.cpp:59
+#: src/hotkey/hotkey_command.cpp:70
 msgid "Default Zoom"
 msgstr "ズームを初期値に戻す"
 
-#: src/hotkey/hotkey_command.cpp:60
+#: src/hotkey/hotkey_command.cpp:71
 msgid "Toggle Full Screen"
 msgstr "フルスクリーンの切り替え"
 
-#: src/hotkey/hotkey_command.cpp:61
+#: src/hotkey/hotkey_command.cpp:72
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: src/hotkey/hotkey_command.cpp:62
+#: src/hotkey/hotkey_command.cpp:73
 msgid "Map Screenshot"
 msgstr "マップのスクリーンショット"
 
-#: src/hotkey/hotkey_command.cpp:63
+#: src/hotkey/hotkey_command.cpp:74
 msgid "Accelerated"
 msgstr "高速化"
 
-#: src/hotkey/hotkey_command.cpp:64
+#: src/hotkey/hotkey_command.cpp:75
 msgid "Terrain Description"
 msgstr "地形情報"
 
-#: src/hotkey/hotkey_command.cpp:65
+#: src/hotkey/hotkey_command.cpp:76
 msgid "Unit Description"
 msgstr "ユニット解説"
 
-#: src/hotkey/hotkey_command.cpp:66
+#: src/hotkey/hotkey_command.cpp:77
 msgid "Rename Unit"
 msgstr "ユニット名を変更"
 
-#: src/hotkey/hotkey_command.cpp:67
+#: src/hotkey/hotkey_command.cpp:78
 msgid "Delete Unit"
 msgstr "ユニットを削除"
 
-#: src/hotkey/hotkey_command.cpp:70
+#: src/hotkey/hotkey_command.cpp:81
 msgid "Save Replay"
 msgstr "リプレイを保存"
 
-#: src/hotkey/hotkey_command.cpp:71 src/hotkey/hotkey_command.cpp:143
+#: src/hotkey/hotkey_command.cpp:82 src/hotkey/hotkey_command.cpp:155
 msgid "Save Map"
 msgstr "マップを保存"
 
-#: src/hotkey/hotkey_command.cpp:74
+#: src/hotkey/hotkey_command.cpp:85
 msgid "Repeat Recruit"
 msgstr "雇用を繰り返す"
 
-#: src/hotkey/hotkey_command.cpp:76
+#: src/hotkey/hotkey_command.cpp:87
 msgid "Show/Hide Labels"
 msgstr "ラベルの表示・非表示"
 
-#: src/hotkey/hotkey_command.cpp:77
+#: src/hotkey/hotkey_command.cpp:88
 msgid "End Turn"
 msgstr "ターン終了"
 
-#: src/hotkey/hotkey_command.cpp:79
+#: src/hotkey/hotkey_command.cpp:90
 msgid "Toggle Ellipses"
 msgstr "ユニット足元の楕円表示の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:80
+#: src/hotkey/hotkey_command.cpp:91
 msgid "Toggle Grid"
 msgstr "グリッド表示の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:81
+#: src/hotkey/hotkey_command.cpp:92
 msgid "Mouse Scrolling"
 msgstr "マウススクロール"
 
-#: src/hotkey/hotkey_command.cpp:82
+#: src/hotkey/hotkey_command.cpp:93
 msgid "Status Table"
 msgstr "ステータステーブル"
 
-#: src/hotkey/hotkey_command.cpp:83
+#: src/hotkey/hotkey_command.cpp:94
 msgid "Mute"
 msgstr "ミュート"
 
-#: src/hotkey/hotkey_command.cpp:84
+#: src/hotkey/hotkey_command.cpp:95
 msgid "Speak"
 msgstr "チャット"
 
-#: src/hotkey/hotkey_command.cpp:86
+#: src/hotkey/hotkey_command.cpp:97
 msgid "Change Side (Debug!)"
 msgstr "陣営変更（デバッグモード）"
 
-#: src/hotkey/hotkey_command.cpp:87
+#: src/hotkey/hotkey_command.cpp:98
 msgid "Kill Unit (Debug!)"
 msgstr "ユニットを殺す（デバッグモード）"
 
-#: src/hotkey/hotkey_command.cpp:89
+#: src/hotkey/hotkey_command.cpp:100
 msgid "Scenario Objectives"
 msgstr "シナリオ目標"
 
-#: src/hotkey/hotkey_command.cpp:92
+#: src/hotkey/hotkey_command.cpp:103
 msgid "Pause Network Game"
 msgstr "通信対戦の一時停止"
 
-#: src/hotkey/hotkey_command.cpp:93
+#: src/hotkey/hotkey_command.cpp:104
 msgid "Continue Network Game"
 msgstr "通信対戦の再開"
 
-#: src/hotkey/hotkey_command.cpp:94
+#: src/hotkey/hotkey_command.cpp:106
 msgid "Quit to Titlescreen"
 msgstr "タイトルスクリーンに戻る"
 
-#: src/hotkey/hotkey_command.cpp:95
+#: src/hotkey/hotkey_command.cpp:107
 msgid "Set Team Label"
 msgstr "チームラベルの設置"
 
-#: src/hotkey/hotkey_command.cpp:96
+#: src/hotkey/hotkey_command.cpp:108
 msgid "Set Label"
 msgstr "ラベルの設置"
 
-#: src/hotkey/hotkey_command.cpp:97
+#: src/hotkey/hotkey_command.cpp:109
 msgid "Clear Labels"
 msgstr "ラベルを消去"
 
-#: src/hotkey/hotkey_command.cpp:98
+#: src/hotkey/hotkey_command.cpp:110
 msgid "Show Enemy Moves"
 msgstr "敵の移動可能範囲の表示"
 
-#: src/hotkey/hotkey_command.cpp:99
+#: src/hotkey/hotkey_command.cpp:111
 msgid "Best Possible Enemy Moves"
 msgstr "最も可能性のある敵の動き"
 
-#: src/hotkey/hotkey_command.cpp:101
+#: src/hotkey/hotkey_command.cpp:113
 msgid "Play Replay"
 msgstr "リプレイを開始"
 
-#: src/hotkey/hotkey_command.cpp:102
+#: src/hotkey/hotkey_command.cpp:114
 msgid "Reset Replay"
 msgstr "リプレイをリセット"
 
-#: src/hotkey/hotkey_command.cpp:103
+#: src/hotkey/hotkey_command.cpp:115
 msgid "Stop Replay"
 msgstr "リプレイの停止"
 
-#: src/hotkey/hotkey_command.cpp:104
+#: src/hotkey/hotkey_command.cpp:116
 msgid "Next Turn"
 msgstr "次のターンをリプレイ"
 
-#: src/hotkey/hotkey_command.cpp:105
+#: src/hotkey/hotkey_command.cpp:117
 msgid "Next Side"
 msgstr "次の陣営をリプレイ"
 
-#: src/hotkey/hotkey_command.cpp:106
+#: src/hotkey/hotkey_command.cpp:118
 msgid "Next Move"
 msgstr "次の動きをリプレイ"
 
-#: src/hotkey/hotkey_command.cpp:107
+#: src/hotkey/hotkey_command.cpp:119
 msgid "Full Map"
 msgstr "視点変更：マップ全体（リプレイ）"
 
-#: src/hotkey/hotkey_command.cpp:108
+#: src/hotkey/hotkey_command.cpp:120
 msgid "Each Team"
 msgstr "視点変更：チームごと（リプレイ）"
 
-#: src/hotkey/hotkey_command.cpp:109
+#: src/hotkey/hotkey_command.cpp:121
 msgid "Human Team"
 msgstr "視点変更：プレイヤー（リプレイ）"
 
-#: src/hotkey/hotkey_command.cpp:110
+#: src/hotkey/hotkey_command.cpp:122
 msgid "Skip Animation"
 msgstr "アニメーションをスキップ（リプレイ）"
 
-#: src/hotkey/hotkey_command.cpp:111
+#: src/hotkey/hotkey_command.cpp:123
 msgid "End Replay"
 msgstr "リプレイ終了"
 
 #. TRANSLATORS: whiteboard menu entry: toggle planning mode
-#: src/hotkey/hotkey_command.cpp:114
+#: src/hotkey/hotkey_command.cpp:126
 msgid "whiteboard^Planning Mode"
 msgstr "計画モードの切り替え"
 
 #. TRANSLATORS: whiteboard menu entry: execute planned action
-#: src/hotkey/hotkey_command.cpp:116
+#: src/hotkey/hotkey_command.cpp:128
 msgid "whiteboard^Execute Action"
 msgstr "アクションを実行"
 
 #. TRANSLATORS: whiteboard menu entry: execute all planned actions
-#: src/hotkey/hotkey_command.cpp:118
+#: src/hotkey/hotkey_command.cpp:130
 msgid "whiteboard^Execute All Actions"
 msgstr "全てのアクションを実行"
 
 #. TRANSLATORS: whiteboard menu entry: delete planned action
-#: src/hotkey/hotkey_command.cpp:120
+#: src/hotkey/hotkey_command.cpp:132
 msgid "whiteboard^Delete Action"
 msgstr "アクションを削除"
 
 #. TRANSLATORS: whiteboard menu entry: move planned action up queue
-#: src/hotkey/hotkey_command.cpp:122
+#: src/hotkey/hotkey_command.cpp:134
 msgid "whiteboard^Move Action Up"
 msgstr "アクションの順番を早める"
 
 #. TRANSLATORS: whiteboard menu entry: move planned action down queue
-#: src/hotkey/hotkey_command.cpp:124
+#: src/hotkey/hotkey_command.cpp:136
 msgid "whiteboard^Move Action Down"
 msgstr "アクションの順番を遅くする"
 
 #. TRANSLATORS: whiteboard menu entry: plan as though the chosen unit were
 #. dead
-#: src/hotkey/hotkey_command.cpp:126
+#: src/hotkey/hotkey_command.cpp:138
 msgid "whiteboard^Suppose Dead"
 msgstr "死亡を仮定（計画モード）"
 
-#: src/hotkey/hotkey_command.cpp:128
+#: src/hotkey/hotkey_command.cpp:140
 msgid "Quit to Desktop"
 msgstr "デスクトップに戻る"
 
-#: src/hotkey/hotkey_command.cpp:129
+#: src/hotkey/hotkey_command.cpp:141
 msgid "Close Map"
 msgstr "マップを閉じる"
 
-#: src/hotkey/hotkey_command.cpp:133
+#: src/hotkey/hotkey_command.cpp:145
 msgid "Switch Time of Day"
 msgstr "時刻帯を切り替える"
 
-#: src/hotkey/hotkey_command.cpp:135
+#: src/hotkey/hotkey_command.cpp:147
 msgid "Switch Map"
 msgstr "マップを切り替える"
 
-#: src/hotkey/hotkey_command.cpp:136
+#: src/hotkey/hotkey_command.cpp:148
 msgid "Assign Local Time"
 msgstr "ローカルタイムを指定する"
 
-#: src/hotkey/hotkey_command.cpp:138
+#: src/hotkey/hotkey_command.cpp:150
 msgid "Time Schedule Editor"
 msgstr "タイムスケジュールエディタ"
 
-#: src/hotkey/hotkey_command.cpp:139
+#: src/hotkey/hotkey_command.cpp:151
 msgid "Partial Undo"
 msgstr "アンドゥ"
 
-#: src/hotkey/hotkey_command.cpp:141
+#: src/hotkey/hotkey_command.cpp:153
 msgid "New Scenario"
 msgstr "新規シナリオ"
 
-#: src/hotkey/hotkey_command.cpp:142
+#: src/hotkey/hotkey_command.cpp:154
 msgid "Load Map"
 msgstr "マップ読み込み"
 
-#: src/hotkey/hotkey_command.cpp:144
+#: src/hotkey/hotkey_command.cpp:156
 msgid "Save Map As"
 msgstr "名前をつけてマップを保存"
 
-#: src/hotkey/hotkey_command.cpp:145
+#: src/hotkey/hotkey_command.cpp:157
 msgid "Save Scenario As"
 msgstr "名前を付けてシナリオを保存"
 
-#: src/hotkey/hotkey_command.cpp:146
+#: src/hotkey/hotkey_command.cpp:158
 msgid "Save All Maps"
 msgstr "全てのマップを保存"
 
-#: src/hotkey/hotkey_command.cpp:147
+#: src/hotkey/hotkey_command.cpp:159
 msgid "Revert All Changes"
 msgstr "全ての変更を取り消す"
 
-#: src/hotkey/hotkey_command.cpp:148
+#: src/hotkey/hotkey_command.cpp:160
 msgid "Map Information"
 msgstr "マップ情報"
 
-#: src/hotkey/hotkey_command.cpp:150
+#: src/hotkey/hotkey_command.cpp:162
 msgid "Clear Selected Item Set"
 msgstr "選択したアイテムセットの消去"
 
-#: src/hotkey/hotkey_command.cpp:151
+#: src/hotkey/hotkey_command.cpp:163
 msgid "Swap Foreground/Background Palette Item"
 msgstr "パレットのメイン/サブの切り替え"
 
-#: src/hotkey/hotkey_command.cpp:152
+#: src/hotkey/hotkey_command.cpp:164
 msgid "Change Palette Group"
 msgstr "パレットグループの変更"
 
-#: src/hotkey/hotkey_command.cpp:153
+#: src/hotkey/hotkey_command.cpp:165
 msgid "Scroll Palette Left"
 msgstr "パレットを下にスクロール"
 
-#: src/hotkey/hotkey_command.cpp:154
+#: src/hotkey/hotkey_command.cpp:166
 msgid "Scroll Palette Right"
 msgstr "パレットを上にスクロール"
 
-#: src/hotkey/hotkey_command.cpp:155
+#: src/hotkey/hotkey_command.cpp:167
 msgid "Remove Location"
 msgstr "開始位置の削除"
 
-#: src/hotkey/hotkey_command.cpp:157
+#: src/hotkey/hotkey_command.cpp:169
 msgid "Add New Side"
 msgstr "新しい陣営の追加"
 
-#: src/hotkey/hotkey_command.cpp:159
+#: src/hotkey/hotkey_command.cpp:171
 msgid "Next Tool"
 msgstr "次のツール"
 
-#: src/hotkey/hotkey_command.cpp:161
+#: src/hotkey/hotkey_command.cpp:173
 msgid "Paint Tool"
 msgstr "ペイントツール"
 
-#: src/hotkey/hotkey_command.cpp:161 src/hotkey/hotkey_command.cpp:162
+#: src/hotkey/hotkey_command.cpp:173 src/hotkey/hotkey_command.cpp:174
 msgid ""
 "Use left/right mouse button to draw fore-/background terrain. Hold Shift to "
 "paint base layer only. Ctrl+click to sample terrain under cursor."
 msgstr "マウスの左 / 右クリックを使ってメイン / サブパレットの地形を描きます。Shiftを押しっぱなしにすることで、ベースレイヤのみに描くことができます。Ctrl+クリックでカーソル下の地形のサンプルを取ります。"
 
-#: src/hotkey/hotkey_command.cpp:162
+#: src/hotkey/hotkey_command.cpp:174
 msgid "Fill Tool"
 msgstr "塗り潰しツール"
 
-#: src/hotkey/hotkey_command.cpp:163
+#: src/hotkey/hotkey_command.cpp:175
 msgid ""
 "Left mouse button selects or deselects with Ctrl, right brings up a context "
 "menu. Hold Shift for magic-wand selection of tiles with same terrain."
 msgstr "マウスの左クリックで選択、Ctrlを押しながらクリックで選択を解除します。右クリックでコンテキストメニューを表示します。シフトキーを押すことで、同じ地形のタイルを選択することができます。"
 
-#: src/hotkey/hotkey_command.cpp:163
+#: src/hotkey/hotkey_command.cpp:175
 msgid "Selection Tool"
 msgstr "選択ツール"
 
-#: src/hotkey/hotkey_command.cpp:164
+#: src/hotkey/hotkey_command.cpp:176
 msgid ""
 "Left mouse button displays player selection, right clears. Number keys "
 "scroll to the starting position, alt+number sets respective starting "
 "position under cursor, delete clears."
 msgstr "左クリックでプレイヤーの開始位置をセットし、右クリックで消去します。数字キーで各開始地点にスクロールし、alt+数字キーで開始地点をカーソル下にセットすることができます。また、deleteキーでカーソル下の開始地点を消去することもできます。"
 
-#: src/hotkey/hotkey_command.cpp:164
+#: src/hotkey/hotkey_command.cpp:176
 msgid "Starting Positions Tool"
 msgstr "開始地点ツール"
 
-#: src/hotkey/hotkey_command.cpp:165
+#: src/hotkey/hotkey_command.cpp:177
 msgid "Label Tool"
 msgstr "ラベルツール"
 
-#: src/hotkey/hotkey_command.cpp:165
+#: src/hotkey/hotkey_command.cpp:177
 msgid "Left mouse button sets or drags a label, right clears."
 msgstr "左クリックでラベルのセット / ドラッグ、右クリックでラベルの消去を行えます。"
 
-#: src/hotkey/hotkey_command.cpp:166
+#: src/hotkey/hotkey_command.cpp:178
 msgid ""
 "Left mouse button sets a new unit or moves a unit via drag and drop, right "
 "brings up a context menu. Needs a defined side."
 msgstr "左クリックで新しいユニットの設置、ドラッグアンドドロップでユニットを移動します。右クリックでコンテキストメニューが開きます。使用の前に陣営を定義しておく必要があります。"
 
-#: src/hotkey/hotkey_command.cpp:166
+#: src/hotkey/hotkey_command.cpp:178
 msgid "Unit Tool"
 msgstr "ユニットツール"
 
-#: src/hotkey/hotkey_command.cpp:167
+#: src/hotkey/hotkey_command.cpp:179
 msgid "Item Tool"
 msgstr "アイテムツール"
 
-#: src/hotkey/hotkey_command.cpp:167
+#: src/hotkey/hotkey_command.cpp:179
 msgid ""
 "Left mouse button sets a new item or moves it via drag and drop, right "
 "clears. Not implemented yet."
 msgstr "左クリックで新しいアイテムを設置し、ドラッグアンドドロップで移動、右クリックで消去します。まだ実装されていません。"
 
-#: src/hotkey/hotkey_command.cpp:168
+#: src/hotkey/hotkey_command.cpp:180
 msgid ""
 "Left mouse button sets or drags a sound source, right clears. Not "
 "implemented yet."
 msgstr "左クリックで音源をセットし、ドラッグで移動、右クリックで消去します。まだ実装されていません。"
 
-#: src/hotkey/hotkey_command.cpp:168
+#: src/hotkey/hotkey_command.cpp:180
 msgid "Sound Source Tool"
 msgstr "音源ツール"
 
-#: src/hotkey/hotkey_command.cpp:169
+#: src/hotkey/hotkey_command.cpp:181
 msgid ""
 "Left mouse button sets the village ownership to the current side, right "
 "clears. Needs a defined side."
 msgstr "左クリックで村の所有権を現在の陣営に設定し、右クリックで取り消します。陣営を定義しておく必要があります。"
 
-#: src/hotkey/hotkey_command.cpp:169
+#: src/hotkey/hotkey_command.cpp:181
 msgid "Village Tool"
 msgstr "村ツール"
 
-#: src/hotkey/hotkey_command.cpp:171
+#: src/hotkey/hotkey_command.cpp:183
 msgid "Can Recruit"
 msgstr "雇用の可否の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:171
+#: src/hotkey/hotkey_command.cpp:183
 msgid "Toggle the recruit attribute of a unit."
 msgstr "ユニットの雇用属性を切り替えます。"
 
-#: src/hotkey/hotkey_command.cpp:172
+#: src/hotkey/hotkey_command.cpp:184
 msgid "Can be Renamed"
 msgstr "リネームの可否の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:172
+#: src/hotkey/hotkey_command.cpp:184
 msgid "Toggle the unit being renameable."
 msgstr "ユニット名の変更の可否を切り替えます。"
 
-#: src/hotkey/hotkey_command.cpp:173
+#: src/hotkey/hotkey_command.cpp:185
 msgid "Assign Recruit List"
 msgstr "雇用リストの設定"
 
-#: src/hotkey/hotkey_command.cpp:173
+#: src/hotkey/hotkey_command.cpp:185
 msgid "Assign the selected unit set as recruit list to the unit."
 msgstr "選択したユニットセットをこのユニットの雇用リストに割り当てます。"
 
-#: src/hotkey/hotkey_command.cpp:175
+#: src/hotkey/hotkey_command.cpp:187
 msgid "Change Unit ID"
 msgstr "ユニットIDの変更"
 
-#: src/hotkey/hotkey_command.cpp:176
+#: src/hotkey/hotkey_command.cpp:188
 msgid "Loyal"
 msgstr "忠義の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:179
+#: src/hotkey/hotkey_command.cpp:191
 msgid "Toggle Minimap Unit Coding"
 msgstr "ミニマップ上のユニット表示色の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:180
+#: src/hotkey/hotkey_command.cpp:192
 msgid "Toggle Minimap Terrain Coding"
 msgstr "ミニマップ上の地形表示形式の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:182
+#: src/hotkey/hotkey_command.cpp:194
 msgid "Toggle Minimap Unit Drawing"
 msgstr "ミニマップ上でのユニットの表示/非表示"
 
-#: src/hotkey/hotkey_command.cpp:183
+#: src/hotkey/hotkey_command.cpp:195
 msgid "Toggle Minimap Village Drawing"
 msgstr "ミニマップ上での村の表示/非表示"
 
-#: src/hotkey/hotkey_command.cpp:184
+#: src/hotkey/hotkey_command.cpp:196
 msgid "Toggle Minimap Terrain Drawing"
 msgstr "ミニマップ上での地形の表示/非表示"
 
-#: src/hotkey/hotkey_command.cpp:186
+#: src/hotkey/hotkey_command.cpp:198
 msgid "Next Brush"
 msgstr "次のブラシ"
 
-#: src/hotkey/hotkey_command.cpp:187
+#: src/hotkey/hotkey_command.cpp:199
 msgid "Default Brush"
 msgstr "デフォルトブラシ"
 
-#: src/hotkey/hotkey_command.cpp:188
+#: src/hotkey/hotkey_command.cpp:200
 msgid "Single Tile"
 msgstr "シングルヘクスブラシ"
 
-#: src/hotkey/hotkey_command.cpp:189
+#: src/hotkey/hotkey_command.cpp:201
 msgid "Radius One"
 msgstr "半径1ヘクスブラシ"
 
-#: src/hotkey/hotkey_command.cpp:190
+#: src/hotkey/hotkey_command.cpp:202
 msgid "Radius Two"
 msgstr "半径2ヘクスブラシ"
 
-#: src/hotkey/hotkey_command.cpp:191
+#: src/hotkey/hotkey_command.cpp:203
 msgid "Brush NW-SE"
 msgstr "北西-南東ブラシ"
 
-#: src/hotkey/hotkey_command.cpp:192
+#: src/hotkey/hotkey_command.cpp:204
 msgid "Brush SW-NE"
 msgstr "南西-北東ブラシ"
 
-#: src/hotkey/hotkey_command.cpp:194
+#: src/hotkey/hotkey_command.cpp:206
 msgid "Cut"
 msgstr "切り取り"
 
-#: src/hotkey/hotkey_command.cpp:195
+#: src/hotkey/hotkey_command.cpp:207
 msgid "Copy"
 msgstr "コピー"
 
-#: src/hotkey/hotkey_command.cpp:196
+#: src/hotkey/hotkey_command.cpp:208
 msgid ""
 "Left mouse button pastes from the clipboard, right brings up a context menu."
 msgstr "左クリックでクリップボードから貼り付け、右クリックでコンテキストメニューを表示します。"
 
-#: src/hotkey/hotkey_command.cpp:196
+#: src/hotkey/hotkey_command.cpp:208
 msgid "Paste"
 msgstr "貼り付け"
 
-#: src/hotkey/hotkey_command.cpp:197
+#: src/hotkey/hotkey_command.cpp:209
 msgid "Export Selected Coordinates to System Clipboard"
 msgstr "選択した座標をクリップボードにコピー"
 
-#: src/hotkey/hotkey_command.cpp:198
+#: src/hotkey/hotkey_command.cpp:210
 msgid "Select All"
 msgstr "全て選択"
 
-#: src/hotkey/hotkey_command.cpp:199
+#: src/hotkey/hotkey_command.cpp:211
 msgid "Select Inverse"
 msgstr "選択部分を反転"
 
-#: src/hotkey/hotkey_command.cpp:200
+#: src/hotkey/hotkey_command.cpp:212
 msgid "Select None"
 msgstr "選択解除"
 
-#: src/hotkey/hotkey_command.cpp:201
+#: src/hotkey/hotkey_command.cpp:213
 msgid "Rotate Clipboard Clockwise"
 msgstr "クリップボードの内容を時計回りに回転"
 
-#: src/hotkey/hotkey_command.cpp:202
+#: src/hotkey/hotkey_command.cpp:214
 msgid "Rotate Clipboard Counter-Clockwise"
 msgstr "クリップボードの内容を反時計回りに回転"
 
-#: src/hotkey/hotkey_command.cpp:203
+#: src/hotkey/hotkey_command.cpp:215
 msgid "Flip Clipboard Horizontally"
 msgstr "クリップボードの内容を水平反転"
 
-#: src/hotkey/hotkey_command.cpp:204
+#: src/hotkey/hotkey_command.cpp:216
 msgid "Flip Clipboard Vertically"
 msgstr "クリップボードの内容を垂直反転"
 
-#: src/hotkey/hotkey_command.cpp:205
+#: src/hotkey/hotkey_command.cpp:217
 msgid "Rotate Selection"
 msgstr "選択部分を回転"
 
-#: src/hotkey/hotkey_command.cpp:206
+#: src/hotkey/hotkey_command.cpp:218
 msgid "Flip Selection"
 msgstr "選択部分を反転する"
 
-#: src/hotkey/hotkey_command.cpp:207
+#: src/hotkey/hotkey_command.cpp:219
 msgid "Fill Selection"
 msgstr "選択部分を塗りつぶす"
 
-#: src/hotkey/hotkey_command.cpp:208
+#: src/hotkey/hotkey_command.cpp:220
 msgid "Generate Tiles in Selection"
 msgstr "選択部分にタイルを生成する"
 
-#: src/hotkey/hotkey_command.cpp:209
+#: src/hotkey/hotkey_command.cpp:221
 msgid "Randomize Tiles in Selection"
 msgstr "選択部分のタイルをランダム化"
 
-#: src/hotkey/hotkey_command.cpp:211
+#: src/hotkey/hotkey_command.cpp:223
 msgid "Rotate Map"
 msgstr "マップを回転"
 
-#: src/hotkey/hotkey_command.cpp:213
+#: src/hotkey/hotkey_command.cpp:225
 msgid "Apply a Mask"
 msgstr "マスクを適用"
 
-#: src/hotkey/hotkey_command.cpp:214
+#: src/hotkey/hotkey_command.cpp:226
 msgid "Create Mask"
 msgstr "マスクを作成"
 
-#: src/hotkey/hotkey_command.cpp:215
+#: src/hotkey/hotkey_command.cpp:227
 msgid "Refresh Display"
 msgstr "画面を再描画"
 
-#: src/hotkey/hotkey_command.cpp:217
+#: src/hotkey/hotkey_command.cpp:229
 msgid "Update Terrain Transitions"
 msgstr "地形の繋ぎ目を更新"
 
-#: src/hotkey/hotkey_command.cpp:220
+#: src/hotkey/hotkey_command.cpp:232
 msgid "Toggle Terrain Transition Update"
 msgstr "地形の繋ぎ目の自動更新の切り替え"
 
-#: src/hotkey/hotkey_command.cpp:222
+#: src/hotkey/hotkey_command.cpp:234
 msgid "Auto-update Terrain Transitions"
 msgstr "地形の繋ぎ目の自動更新"
 
-#: src/hotkey/hotkey_command.cpp:223
+#: src/hotkey/hotkey_command.cpp:235
 msgid "Auto-update Terrain Transitions: No"
 msgstr "地形の繋ぎ目の自動更新：OFF"
 
-#: src/hotkey/hotkey_command.cpp:224
+#: src/hotkey/hotkey_command.cpp:236
 msgid "Auto-update Terrain Transitions: Partial"
 msgstr "地形の繋ぎ目の自動更新：一部"
 
-#: src/hotkey/hotkey_command.cpp:226
+#: src/hotkey/hotkey_command.cpp:238
 msgid "Refresh Image Cache"
 msgstr "イメージキャッシュを更新"
 
-#: src/hotkey/hotkey_command.cpp:227
+#: src/hotkey/hotkey_command.cpp:239
 msgid "Draw Hex Coordinates"
 msgstr "ヘクスの座標を描画"
 
-#: src/hotkey/hotkey_command.cpp:228
+#: src/hotkey/hotkey_command.cpp:240
 msgid "Draw Terrain Codes"
 msgstr "地形コードを描画"
 
-#: src/hotkey/hotkey_command.cpp:229
+#: src/hotkey/hotkey_command.cpp:241
 msgid "Draw Number of Bitmaps"
 msgstr "ビットマップの数を表示"
 
-#: src/hotkey/hotkey_command.cpp:231
+#: src/hotkey/hotkey_command.cpp:243
 msgid "Save Selection to Area"
 msgstr "選択部分を領域として保存"
 
-#: src/hotkey/hotkey_command.cpp:232
+#: src/hotkey/hotkey_command.cpp:244
 msgid "Rename Selected Area"
 msgstr "選択領域のリネーム"
 
-#: src/hotkey/hotkey_command.cpp:233
+#: src/hotkey/hotkey_command.cpp:245
 msgid "Remove Selected Area"
 msgstr "選択領域の削除"
 
-#: src/hotkey/hotkey_command.cpp:234
+#: src/hotkey/hotkey_command.cpp:246
 msgid "Add New Area"
 msgstr "新たな領域の追加"
 
-#: src/hotkey/hotkey_command.cpp:236
+#: src/hotkey/hotkey_command.cpp:248
 msgid "Edit Scenario"
 msgstr "シナリオの編集"
 
-#: src/hotkey/hotkey_command.cpp:237
+#: src/hotkey/hotkey_command.cpp:249
 msgid "Edit Side"
 msgstr "陣営の編集"
 
-#: src/hotkey/hotkey_command.cpp:238
+#: src/hotkey/hotkey_command.cpp:250
 msgid "Remove Side"
 msgstr "陣営の削除"
 
-#: src/hotkey/hotkey_command.cpp:240
+#: src/hotkey/hotkey_command.cpp:252
 msgid "Delay Shroud Updates"
 msgstr "幕の更新を遅らせる"
 
-#: src/hotkey/hotkey_command.cpp:241
+#: src/hotkey/hotkey_command.cpp:253
 msgid "Update Shroud Now"
 msgstr "幕を今すぐ更新する"
 
-#: src/hotkey/hotkey_command.cpp:242
+#: src/hotkey/hotkey_command.cpp:254
 msgid "Continue Move"
 msgstr "移動を続ける"
 
-#: src/hotkey/hotkey_command.cpp:243
+#: src/hotkey/hotkey_command.cpp:255
 msgid "Find Label or Unit"
 msgstr "ラベルまたはユニットの検索"
 
-#: src/hotkey/hotkey_command.cpp:244
+#: src/hotkey/hotkey_command.cpp:256
 msgid "Speak to Ally"
 msgstr "同盟軍とチャット"
 
-#: src/hotkey/hotkey_command.cpp:245
+#: src/hotkey/hotkey_command.cpp:257
 msgid "Speak to All"
 msgstr "全員とチャット"
 
-#: src/hotkey/hotkey_command.cpp:247
+#: src/hotkey/hotkey_command.cpp:259
 msgid "View Chat Log"
 msgstr "チャットログ表示"
 
-#: src/hotkey/hotkey_command.cpp:248
+#: src/hotkey/hotkey_command.cpp:260
 msgid "Enter User Command"
 msgstr "ユーザーコマンドを入力"
 
-#: src/hotkey/hotkey_command.cpp:249
+#: src/hotkey/hotkey_command.cpp:261
 msgid "Custom Command"
 msgstr "カスタムコマンド"
 
-#: src/hotkey/hotkey_command.cpp:250
+#: src/hotkey/hotkey_command.cpp:262
 msgid "Run Formula"
 msgstr "フォーミュラの実行"
 
-#: src/hotkey/hotkey_command.cpp:251
+#: src/hotkey/hotkey_command.cpp:263
 msgid "Clear Messages"
 msgstr "チャットメッセージを消去"
 
-#: src/hotkey/hotkey_command.cpp:253
+#: src/hotkey/hotkey_command.cpp:265
 msgid "Change Language"
 msgstr "言語の変更"
 
-#: src/hotkey/hotkey_command.cpp:254
+#: src/hotkey/hotkey_command.cpp:266
 msgid "Refresh WML"
 msgstr "WMLのリフレッシュ"
 
-#: src/hotkey/hotkey_command.cpp:255
+#: src/hotkey/hotkey_command.cpp:267
 msgid "Next Tip of the Day"
 msgstr "次のヒント"
 
-#: src/hotkey/hotkey_command.cpp:256
+#: src/hotkey/hotkey_command.cpp:268
 msgid "Previous Tip of the Day"
 msgstr "前のヒント"
 
-#: src/hotkey/hotkey_command.cpp:257
+#: src/hotkey/hotkey_command.cpp:269
 msgid "Start Tutorial"
 msgstr "チュートリアルの開始"
 
-#: src/hotkey/hotkey_command.cpp:258
+#: src/hotkey/hotkey_command.cpp:270
 msgid "Start Campaign"
 msgstr "キャンペーンの開始"
 
-#: src/hotkey/hotkey_command.cpp:259
+#: src/hotkey/hotkey_command.cpp:271
 msgid "Start Multiplayer Game"
 msgstr "マルチプレイヤーゲームの開始"
 
-#: src/hotkey/hotkey_command.cpp:260
+#: src/hotkey/hotkey_command.cpp:272
 msgid "Manage Add-ons"
 msgstr "アドオンの管理"
 
-#: src/hotkey/hotkey_command.cpp:261
+#: src/hotkey/hotkey_command.cpp:273
 msgid "Manage Cores"
 msgstr "コアの管理"
 
-#: src/hotkey/hotkey_command.cpp:262
+#: src/hotkey/hotkey_command.cpp:274
 msgid "Start Editor"
 msgstr "エディタの起動"
 
-#: src/hotkey/hotkey_command.cpp:263
+#: src/hotkey/hotkey_command.cpp:275
 msgid "Show Credits"
 msgstr "クレジットの表示"
 
-#: src/hotkey/hotkey_command.cpp:265
+#: src/hotkey/hotkey_command.cpp:276
+msgid "Start Test Scenario"
+msgstr "テストシナリオの開始"
+
+#: src/hotkey/hotkey_command.cpp:278
 msgid "Show Helptip"
 msgstr "ヘルプチップの表示"
 
-#: src/hotkey/hotkey_command.cpp:267
+#: src/hotkey/hotkey_command.cpp:280
 msgid "Show Lua Console"
 msgstr "Luaコンソールの表示"
 
-#: src/hotkey/hotkey_command.cpp:270
+#: src/hotkey/hotkey_command.cpp:283
 msgid "Unrecognized Command"
 msgstr "認識できないコマンド"
 
-#: src/hotkey/hotkey_preferences_display.cpp:36
-msgid "Press desired hotkey (Esc cancels)"
-msgstr "希望のホットキーを押して下さい （Escでキャンセル）"
-
 #. TRANSLATORS: This is the language code which will be used
 #. to store and fetch localized non-textual resources, such as images,
 #. when they exist. Normally it is just the code of the PO file itself,
@@ -6699,58 +7048,70 @@ msgstr "希望のホットキーを押して下さい （Escでキャンセル
 #. other's resources rather than duplicating them. For example,
 #. Swedish (sv) and Danish (da) are such, so Swedish translator could
 #. translate this message as "sv,da", while Danish as "da,sv".
-#: src/image.cpp:452
+#: src/image.cpp:532
 msgid "language code for localized resources^en_US"
 msgstr "ja"
 
-#: src/preferences_display.cpp:107
+#: src/preferences/display.cpp:124
 msgid "No known themes. Try changing from within an existing game."
 msgstr "テーマがありません。既存のゲーム内から変更してみて下さい。"
 
-#: src/preferences_display.cpp:148
+#: src/preferences/display.cpp:166
 msgid ""
 "The <b>$filename</b> server application provides multiplayer server "
 "functionality and is required for hosting local network games. It will "
 "normally be found in the same folder as the game executable."
 msgstr "<b>$filename</b> サーバーはマルチプレイヤー用のサーバーであり、ローカルネットワークゲームを立てるために必要です。通常は、ゲームの実行ファイルと同じフォルダに置かれています。"
 
-#: src/preferences_display.cpp:152
+#: src/preferences/display.cpp:170
 msgid "Find Server Application"
 msgstr "サーバープログラムの探索"
 
-#: src/terrain/translation.cpp:709
+#: src/preferences/game.cpp:379
+msgid "No server has been defined."
+msgstr "サーバーが1つも設定されていません。"
+
+#: src/preferences/game.cpp:902
+msgid "[%H:%M]"
+msgstr "[%H:%M]"
+
+#: src/preferences/game.cpp:905
+msgid "[%I:%M %p]"
+msgstr "[%I:%M %p]"
+
+#: src/terrain/translation.cpp:710
 msgid ""
 "A terrain with a string with more than 4 characters has been found, the "
 "affected terrain is :"
 msgstr "4文字以上の文字列の地形が見つかりました。影響される地形："
 
-#: src/wml_exception.cpp:63
+#: src/wml_exception.cpp:62
 msgid ""
 "An error due to possibly invalid WML occurred\n"
 "The error message is :"
 msgstr "無効なWMLが原因だと思われるエラーが起こりました。\nエラーメッセージ："
 
-#: src/wml_exception.cpp:65
+#: src/wml_exception.cpp:64
 msgid "When reporting the bug please include the following error message :"
 msgstr "バグを報告する際には以下のエラーメッセージを含めてください："
 
-#: src/wml_exception.cpp:95
+#: src/wml_exception.cpp:94
 msgid ""
 "In section '[$section|]' where '$primary_key| = $primary_value' the "
 "mandatory key '$key|' isn't set."
 msgstr "「 $primary_key| = $primary_value 」である「 [$section|] 」セクションにおいて必須のキー「 $key| 」が設定されていません。"
 
-#: src/wml_exception.cpp:98
+#: src/wml_exception.cpp:97
 msgid "In section '[$section|]' the mandatory key '$key|' isn't set."
 msgstr "「 [$section|] 」セクションにおいて必須のキー「 $key| 」が設定されていません。"
 
-#: src/wml_exception.cpp:114
+#: src/wml_exception.cpp:113
 msgid ""
 "The key '$key' is deprecated and support will be removed in version "
 "$removal_version."
 msgstr "キー「$key」は推奨されておらず、バージョン $removal_version でサポートが取り除かれます。"
 
-#: src/wml_exception.cpp:133
+#: src/wml_exception.cpp:132
 msgid ""
 "The key '$deprecated_key' has been renamed to '$key'. Support for "
 "'$deprecated_key' will be removed in version $removal_version."