diff --git a/po/wesnoth-aoi/en_GB.po b/po/wesnoth-aoi/en_GB.po
index b7a6b02af1b..5e1e10ea124 100644
--- a/po/wesnoth-aoi/en_GB.po
+++ b/po/wesnoth-aoi/en_GB.po
@@ -568,6 +568,7 @@ msgstr ""
 
 #. [objectives]
 #: data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg:84
+#, fuzzy
 msgid ""
 "Hint:\n"
 "There are no villages in this scenario - you must use healers instead. Use "
@@ -575,7 +576,7 @@ msgid ""
 msgstr ""
 "Hint:\n"
 "There are no villages in this scenario - you must use healers instead. Use "
-"hit and run tactics to weaken enemy units who cannot heal themselves."
+"hit-and-run tactics to weaken enemy units who cannot heal themselves."
 
 #. [objective]: condition=win
 #: data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg:90
@@ -992,12 +993,13 @@ msgstr ""
 
 #. [message]: speaker=narrator
 #: data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg:291
+#, fuzzy
 msgid ""
 "During their retreat, the  pass was crossed by another army moving in the "
 "opposite direction. Orcs were back south of the pass, and this time they "
 "were to stay for a long, long time."
 msgstr ""
-"During their retreat, the  pass was crossed by another army moving in the "
+"During their retreat, the pass was crossed by another army moving in the "
 "opposite direction. Orcs were back south of the pass, and this time they "
 "were to stay for a long, long time."
 
@@ -1064,12 +1066,13 @@ msgstr "Linaera the Quick"
 
 #. [part]
 #: data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg:24
+#, fuzzy
 msgid ""
 "After a day of hard-earned rest the elves marched north again. This was "
 "unknown country, not frequented even by Wesmere's furtherest-faring scouts."
 msgstr ""
 "After a day of hard-earned rest the elves marched north again. This was "
-"unknown country, not frequented even by Wesmere's furtherest-faring scouts."
+"unknown country, not frequented even by Wesmere's furthermost-faring scouts."
 
 #. [part]
 #: data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg:28
@@ -1106,13 +1109,14 @@ msgstr "Wizards"
 
 #. [objectives]
 #: data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg:106
+#, fuzzy
 msgid ""
 "Hint:\n"
 "Use Elven Scouts and Linaera's power of teleportation to mount hit and run "
 "attacks."
 msgstr ""
 "Hint:\n"
-"Use Elven Scouts and Linaera's power of teleportation to mount hit and run "
+"Use Elven Scouts and Linaera's power of teleportation to mount hit-and-run "
 "attacks."
 
 #. [objective]: condition=win
@@ -1386,13 +1390,14 @@ msgstr "Rualsha-Tan"
 
 #. [objectives]
 #: data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg:111
+#, fuzzy
 msgid ""
 "Hint:\n"
 "Your enemy is well defended against attacks from the south. Use rangers to "
 "sneak through the forest and mount a surprise attack from the north."
 msgstr ""
 "Hint:\n"
-"Your enemy is well defended against attacks from the south. Use rangers to "
+"Your enemy is well-defended against attacks from the south. Use rangers to "
 "sneak through the forest and mount a surprise attack from the north."
 
 #. [objective]: condition=win
diff --git a/po/wesnoth-did/en_GB.po b/po/wesnoth-did/en_GB.po
index 34754b73b89..53f0e98087d 100644
--- a/po/wesnoth-did/en_GB.po
+++ b/po/wesnoth-did/en_GB.po
@@ -1218,6 +1218,7 @@ msgstr "Return to Parthyn"
 
 #. [part]
 #: data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg:18
+#, fuzzy
 msgid ""
 "Two days travel south of the previous battle, Malin loses the trail of the "
 "regrouped orcish warriors, but soon picks it up again. The trail moves "
@@ -1226,7 +1227,7 @@ msgid ""
 msgstr ""
 "Two days travel south of the previous battle, Malin loses the trail of the "
 "regrouped orcish warriors, but soon picks it up again. The trail moves "
-"unfailingly south for several days. As soon as it crosses the great river it "
+"unfailingly south for several days. As soon as it crosses the Great River it "
 "immediately turns west."
 
 #. [part]
@@ -1654,9 +1655,9 @@ msgstr ""
 
 #. [objective]: condition=win
 #: data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg:407
+#, fuzzy
 msgid "Move through the passage way in the northwest leading to the great hall"
-msgstr ""
-"Move through the passage way in the northwest leading to the great hall"
+msgstr "Move through the passageway in the northwest leading to the great hall"
 
 #. [message]: speaker=unit
 #: data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg:433
diff --git a/po/wesnoth-ei/en_GB.po b/po/wesnoth-ei/en_GB.po
index 44e54a04551..8ad11becc8a 100644
--- a/po/wesnoth-ei/en_GB.po
+++ b/po/wesnoth-ei/en_GB.po
@@ -1287,8 +1287,9 @@ msgstr ""
 
 #. [message]: speaker=Mal-Ravanal
 #: data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg:531
+#, fuzzy
 msgid "You dare to attack ME?!? Go back to your master!"
-msgstr "You dare to attack ME?!? Go back to your master!"
+msgstr "You dare to attack <i>me?</i>!? Go back to your master!"
 
 #. [message]: speaker=Gweddry
 #: data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg:535
@@ -3228,11 +3229,12 @@ msgstr ""
 
 #. [message]: speaker=Gweddry
 #: data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg:137
+#, fuzzy
 msgid ""
 "Wait - What just happened? He called more warriors out of the ground! That's "
 "not allowed!"
 msgstr ""
-"Wait - What just happened? He called more warriors out of the ground! That's "
+"Wait - what just happened? He called more warriors out of the ground! That's "
 "not allowed!"
 
 #. [message]: speaker=Mal-Ravanal
diff --git a/po/wesnoth-httt/en_GB.po b/po/wesnoth-httt/en_GB.po
index 73a339a0912..cdec8121bbe 100644
--- a/po/wesnoth-httt/en_GB.po
+++ b/po/wesnoth-httt/en_GB.po
@@ -2677,12 +2677,13 @@ msgstr ""
 
 #. [message]: speaker=Li'sar
 #: data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg:305
+#, fuzzy
 msgid ""
 "I see that your forces draw near, impostor! I'll not be defeated in my own "
 "back yard so easily... Come forth and attack, my loyal duelist!"
 msgstr ""
 "I see that your forces draw near, impostor! I'll not be defeated in my own "
-"back yard so easily... Come forth and attack, my loyal duelist!"
+"back-yard so easily... Come forth and attack, my loyal duelist!"
 
 #. [then]
 #: data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg:319
@@ -2867,6 +2868,7 @@ msgstr ""
 
 #. [message]: speaker=Moremirmu
 #: data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg:380
+#, fuzzy
 msgid ""
 "You must escape the clutches of that vile Queen, my lord. If you take a "
 "course bearing north-east, on past the mountain of gryphons, you will be "
@@ -2875,7 +2877,7 @@ msgid ""
 msgstr ""
 "You must escape the clutches of that vile Queen, my lord. If you take a "
 "course bearing north-east, on past the mountain of gryphons, you will be "
-"able to ford the great river at Abez. Make haste though, for you will not be "
+"able to ford the Great River at Abez. Make haste though, for you will not be "
 "able to ford the river in winter!"
 
 #. [message]: speaker=Konrad
@@ -2921,13 +2923,14 @@ msgstr ""
 
 #. [message]: speaker=Kalenz
 #: data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg:417
+#, fuzzy
 msgid ""
 "The land of Wesnoth is not safe for us. The Queen's forces reach every "
 "corner. We must make haste to the north lands, across the great river. Let "
 "us go quickly!"
 msgstr ""
 "The land of Wesnoth is not safe for us. The Queen's forces reach every "
-"corner. We must make haste to the north lands, across the great river. Let "
+"corner. We must make haste to the north lands, across the Great River. Let "
 "us go quickly!"
 
 #. [message]: speaker=Delfador
@@ -3045,13 +3048,14 @@ msgstr "We have defeated them! Now what do we do?"
 
 #. [message]: speaker=Delfador
 #: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:232
+#, fuzzy
 msgid ""
 "We must continue north. It is too late to return to the safety of Elensefar "
 "or Alduin before winter falls. We must therefore cross the great river and "
 "continue toward the land of the dwarves. Hurry, let us go!"
 msgstr ""
 "We must continue north. It is too late to return to the safety of Elensefar "
-"or Alduin before winter falls. We must therefore cross the great river and "
+"or Alduin before winter falls. We must therefore cross the Great River and "
 "continue toward the land of the dwarves. Hurry, let us go!"
 
 #. [message]: speaker=Konrad
@@ -5062,13 +5066,14 @@ msgstr ""
 
 #. [message]: speaker=Li'sar
 #: data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg:209
+#, fuzzy
 msgid ""
 "No, I was thinking... I don't really want to kill you. I have what I came to "
 "get. So if you promise never to come south of the great river, I will spare "
 "your life."
 msgstr ""
 "No, I was thinking... I don't really want to kill you. I have what I came to "
-"get. So if you promise never to come south of the great river, I will spare "
+"get. So if you promise never to come south of the Great River, I will spare "
 "your life."
 
 #. [message]: speaker=Kalenz
diff --git a/po/wesnoth-manpages/en_GB.po b/po/wesnoth-manpages/en_GB.po
index 348a3b3b0f3..01ab5266056 100644
--- a/po/wesnoth-manpages/en_GB.po
+++ b/po/wesnoth-manpages/en_GB.po
@@ -24,8 +24,7 @@ msgid "WESNOTH"
 msgstr "WESNOTH"
 
 # type: TH
-#: ../../doc/man/wesnoth.6:16
-#: ../../doc/man/wesnothd.6:16
+#: ../../doc/man/wesnoth.6:16 ../../doc/man/wesnothd.6:16
 #, no-wrap
 msgid "2009"
 msgstr "2009"
@@ -43,8 +42,7 @@ msgid "Battle for Wesnoth"
 msgstr "Battle for Wesnoth"
 
 # type: SH
-#: ../../doc/man/wesnoth.6:18
-#: ../../doc/man/wesnothd.6:18
+#: ../../doc/man/wesnoth.6:18 ../../doc/man/wesnothd.6:18
 #, no-wrap
 msgid "NAME"
 msgstr "NAME"
@@ -55,8 +53,7 @@ msgid "wesnoth - Battle for Wesnoth, a turn-based fantasy strategy game"
 msgstr "wesnoth - Battle for Wesnoth, a turn-based fantasy strategy game"
 
 # type: SH
-#: ../../doc/man/wesnoth.6:21
-#: ../../doc/man/wesnothd.6:24
+#: ../../doc/man/wesnoth.6:21 ../../doc/man/wesnothd.6:24
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
@@ -67,8 +64,7 @@ msgid "B<wesnoth> [I<OPTIONS>] [I<PATH_TO_DATA>]"
 msgstr "B<wesnoth> [I<OPTIONS>] [I<PATH_TO_DATA>]"
 
 # type: SH
-#: ../../doc/man/wesnoth.6:27
-#: ../../doc/man/wesnothd.6:40
+#: ../../doc/man/wesnoth.6:27 ../../doc/man/wesnothd.6:40
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -80,12 +76,27 @@ msgstr "Battle for B<Wesnoth> is a turn-based fantasy strategy game."
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:42
-msgid "Defeat all enemy leaders using a well-chosen cadre of troops, taking care to manage your resources of gold and villages. All units have their own strengths and weaknesses; to win, deploy your forces to their best advantage while denying your foes the chance to do the same. As units gain experience, they acquire new abilities and become more powerful. Play in your own language and test your skill against a smart computer opponent, or join Wesnoth's large community of on-line players. Create your own custom units, scenarios or campaigns, and share them with others."
-msgstr "Defeat all enemy leaders using a well-chosen cadre of troops, taking care to manage your resources of gold and villages. All units have their own strengths and weaknesses; to win, deploy your forces to their best advantage while denying your foes the chance to do the same. As units gain experience, they acquire new abilities and become more powerful. Play in your own language and test your skill against a smart computer opponent, or join Wesnoth's large community of on-line players. Create your own custom units, scenarios or campaigns, and share them with others."
+msgid ""
+"Defeat all enemy leaders using a well-chosen cadre of troops, taking care to "
+"manage your resources of gold and villages. All units have their own "
+"strengths and weaknesses; to win, deploy your forces to their best advantage "
+"while denying your foes the chance to do the same. As units gain experience, "
+"they acquire new abilities and become more powerful. Play in your own "
+"language and test your skill against a smart computer opponent, or join "
+"Wesnoth's large community of on-line players. Create your own custom units, "
+"scenarios or campaigns, and share them with others."
+msgstr ""
+"Defeat all enemy leaders using a well-chosen cadre of troops, taking care to "
+"manage your resources of gold and villages. All units have their own "
+"strengths and weaknesses; to win, deploy your forces to their best advantage "
+"while denying your foes the chance to do the same. As units gain experience, "
+"they acquire new abilities and become more powerful. Play in your own "
+"language and test your skill against a smart computer opponent, or join "
+"Wesnoth's large community of on-line players. Create your own custom units, "
+"scenarios or campaigns, and share them with others."
 
 # type: SH
-#: ../../doc/man/wesnoth.6:43
-#: ../../doc/man/wesnothd.6:45
+#: ../../doc/man/wesnoth.6:43 ../../doc/man/wesnothd.6:45
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
@@ -120,8 +131,12 @@ msgstr "B<--config-dir>I<\\ name>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:57
-msgid "sets the user configuration directory to I<name> under $HOME or \"My Documents\\eMy Games\" for windows."
-msgstr "sets the user configuration directory to I<name> under $HOME or \"My Documents\\eMy Games\" for windows."
+msgid ""
+"sets the user configuration directory to I<name> under $HOME or \"My "
+"Documents\\eMy Games\" for windows."
+msgstr ""
+"sets the user configuration directory to I<name> under $HOME or \"My "
+"Documents\\eMy Games\" for windows."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:57
@@ -142,8 +157,12 @@ msgstr "B<-d, --debug>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:64
-msgid "enables additional command mode options in-game (see the wiki page at http://www.wesnoth.org/wiki/CommandMode for more information about command mode)."
-msgstr "enables additional command mode options in-game (see the wiki page at http://www.wesnoth.org/wiki/CommandMode for more information about command mode)."
+msgid ""
+"enables additional command mode options in-game (see the wiki page at http://"
+"www.wesnoth.org/wiki/CommandMode for more information about command mode)."
+msgstr ""
+"enables additional command mode options in-game (see the wiki page at http://"
+"www.wesnoth.org/wiki/CommandMode for more information about command mode)."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:64
@@ -153,8 +172,12 @@ msgstr "B<--dummy-locales>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:68
-msgid "use special dummy locales to switch to any language even if that language isn't installed system-wide."
-msgstr "use special dummy locales to switch to any language even if that language isn't installed system-wide."
+msgid ""
+"use special dummy locales to switch to any language even if that language "
+"isn't installed system-wide."
+msgstr ""
+"use special dummy locales to switch to any language even if that language "
+"isn't installed system-wide."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:68
@@ -164,8 +187,12 @@ msgstr "B<-e, --editor \\ file>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:74
-msgid "start the in-game map editor directly. If I<file> is specified, equivalent to B<-e --load>"
-msgstr "start the in-game map editor directly. If I<file> is specified, equivalent to B<-e --load>"
+msgid ""
+"start the in-game map editor directly. If I<file> is specified, equivalent "
+"to B<-e --load>"
+msgstr ""
+"start the in-game map editor directly. If I<file> is specified, equivalent "
+"to B<-e --load>"
 
 # type: TP
 #: ../../doc/man/wesnoth.6:74
@@ -175,8 +202,12 @@ msgstr "B<--fps>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:78
-msgid "displays the number of frames per second the game is currently running at, in a corner of the screen."
-msgstr "displays the number of frames per second the game is currently running at, in a corner of the screen."
+msgid ""
+"displays the number of frames per second the game is currently running at, "
+"in a corner of the screen."
+msgstr ""
+"displays the number of frames per second the game is currently running at, "
+"in a corner of the screen."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:78
@@ -197,8 +228,12 @@ msgstr "B<--gunzip>I<\\ infile.gz>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:87
-msgid "decompresses a file which should be in gzip format and stores it without the .gz suffix. The I<infile.gz> will be removed."
-msgstr "decompresses a file which should be in gzip format and stores it without the .gz suffix. The I<infile.gz> will be removed."
+msgid ""
+"decompresses a file which should be in gzip format and stores it without "
+"the .gz suffix. The I<infile.gz> will be removed."
+msgstr ""
+"decompresses a file which should be in gzip format and stores it without "
+"the .gz suffix. The I<infile.gz> will be removed."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:87
@@ -208,20 +243,25 @@ msgstr "B<--gzip>I<\\ infile>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:93
-msgid "compresses a file in gzip format, stores it as I<infile>.gz and removes I<infile>."
-msgstr "compresses a file in gzip format, stores it as I<infile>.gz and removes I<infile>."
+msgid ""
+"compresses a file in gzip format, stores it as I<infile>.gz and removes "
+"I<infile>."
+msgstr ""
+"compresses a file in gzip format, stores it as I<infile>.gz and removes "
+"I<infile>."
 
 # type: TP
-#: ../../doc/man/wesnoth.6:93
-#: ../../doc/man/wesnothd.6:55
+#: ../../doc/man/wesnoth.6:93 ../../doc/man/wesnothd.6:55
 #, no-wrap
 msgid "B<-h, --help>"
 msgstr "B<-h, --help>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:96
-msgid "displays a summary of command line options to standard output, and exits."
-msgstr "displays a summary of command line options to standard output, and exits."
+msgid ""
+"displays a summary of command line options to standard output, and exits."
+msgstr ""
+"displays a summary of command line options to standard output, and exits."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:96
@@ -231,20 +271,33 @@ msgstr "B<-l,\\ --load>I<\\ file>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:108
-msgid "loads the savegame I<file> from the standard save game directory.  If the B<-e> or B<--editor> option is used as well, starts the editor with the map from I<file> open. If it is a directory, the editor will start with a load map dialog opened there."
-msgstr "loads the savegame I<file> from the standard save game directory.  If the B<-e> or B<--editor> option is used as well, starts the editor with the map from I<file> open. If it is a directory, the editor will start with a load map dialog opened there."
+msgid ""
+"loads the savegame I<file> from the standard save game directory.  If the B<-"
+"e> or B<--editor> option is used as well, starts the editor with the map "
+"from I<file> open. If it is a directory, the editor will start with a load "
+"map dialog opened there."
+msgstr ""
+"loads the savegame I<file> from the standard save game directory.  If the B<-"
+"e> or B<--editor> option is used as well, starts the editor with the map "
+"from I<file> open. If it is a directory, the editor will start with a load "
+"map dialog opened there."
 
 # type: TP
-#: ../../doc/man/wesnoth.6:108
-#: ../../doc/man/wesnothd.6:58
+#: ../../doc/man/wesnoth.6:108 ../../doc/man/wesnothd.6:58
 #, no-wrap
 msgid "B<--log->I<level>B<=>I<domain1>B<,>I<domain2>B<,>I<...>"
 msgstr "B<--log->I<level>B<=>I<domain1>B<,>I<domain2>B<,>I<...>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:117
-msgid "sets the severity level of the log domains.  B<all> can be used to match any log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ B<debug>.  By default the B<error> level is used."
-msgstr "sets the severity level of the log domains.  B<all> can be used to match any log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ B<debug>.  By default the B<error> level is used."
+msgid ""
+"sets the severity level of the log domains.  B<all> can be used to match any "
+"log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ "
+"B<debug>.  By default the B<error> level is used."
+msgstr ""
+"sets the severity level of the log domains.  B<all> can be used to match any "
+"log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ "
+"B<debug>.  By default the B<error> level is used."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:117
@@ -265,8 +318,12 @@ msgstr "B<--max-fps>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:125
-msgid "the number of frames per second the game can show, the value should be between the 1 and 1000, the default is B<50>."
-msgstr "the number of frames per second the game can show, the value should be between the 1 and 1000, the default is B<50>."
+msgid ""
+"the number of frames per second the game can show, the value should be "
+"between the 1 and 1000, the default is B<50>."
+msgstr ""
+"the number of frames per second the game can show, the value should be "
+"between the 1 and 1000, the default is B<50>."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:125
@@ -276,8 +333,12 @@ msgstr "B<-m, --multiplayer>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:131
-msgid "runs a multiplayer game. There are additional options that can be used together with B<--multiplayer> as explained below."
-msgstr "runs a multiplayer game. There are additional options that can be used together with B<--multiplayer> as explained below."
+msgid ""
+"runs a multiplayer game. There are additional options that can be used "
+"together with B<--multiplayer> as explained below."
+msgstr ""
+"runs a multiplayer game. There are additional options that can be used "
+"together with B<--multiplayer> as explained below."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:131
@@ -287,8 +348,12 @@ msgstr "B<--no-delay>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:135
-msgid "runs the game without any delays for graphic benchmarking. This is automatically enabled by B<--nogui>."
-msgstr "runs the game without any delays for graphic benchmarking. This is automatically enabled by B<--nogui>."
+msgid ""
+"runs the game without any delays for graphic benchmarking. This is "
+"automatically enabled by B<--nogui>."
+msgstr ""
+"runs the game without any delays for graphic benchmarking. This is "
+"automatically enabled by B<--nogui>."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:135
@@ -353,8 +418,12 @@ msgstr "B<--smallgui>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:154
-msgid "allows to use screen resolutions down to 800x480 and resizes a few interface elements."
-msgstr "allows to use screen resolutions down to 800x480 and resizes a few interface elements."
+msgid ""
+"allows to use screen resolutions down to 800x480 and resizes a few interface "
+"elements."
+msgstr ""
+"allows to use screen resolutions down to 800x480 and resizes a few interface "
+"elements."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:154
@@ -364,8 +433,12 @@ msgstr "B<-s,\\ --server\\ [host]>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:158
-msgid "connects to the specified host if any, otherwise connect to the first server in preferences. Example: B<--server server.wesnoth.org>"
-msgstr "connects to the specified host if any, otherwise connect to the first server in preferences. Example: B<--server server.wesnoth.org>"
+msgid ""
+"connects to the specified host if any, otherwise connect to the first server "
+"in preferences. Example: B<--server server.wesnoth.org>"
+msgstr ""
+"connects to the specified host if any, otherwise connect to the first server "
+"in preferences. Example: B<--server server.wesnoth.org>"
 
 # type: TP
 #: ../../doc/man/wesnoth.6:158
@@ -430,8 +503,14 @@ msgstr "Options for --multiplayer"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:183
-msgid "The side-specific multiplayer options are marked with I<number>.  I<number> has to be replaced by a side number. It usually is 1 or 2 but depends on the number of players possible in the chosen scenario."
-msgstr "The side-specific multiplayer options are marked with I<number>.  I<number> has to be replaced by a side number. It usually is 1 or 2 but depends on the number of players possible in the chosen scenario."
+msgid ""
+"The side-specific multiplayer options are marked with I<number>.  I<number> "
+"has to be replaced by a side number. It usually is 1 or 2 but depends on the "
+"number of players possible in the chosen scenario."
+msgstr ""
+"The side-specific multiplayer options are marked with I<number>.  I<number> "
+"has to be replaced by a side number. It usually is 1 or 2 but depends on the "
+"number of players possible in the chosen scenario."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:183
@@ -441,8 +520,10 @@ msgstr "B<--ai_config>I<number>B<=>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:186
-msgid "selects a configuration file to load for the AI controller for this side."
-msgstr "selects a configuration file to load for the AI controller for this side."
+msgid ""
+"selects a configuration file to load for the AI controller for this side."
+msgstr ""
+"selects a configuration file to load for the AI controller for this side."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:186
@@ -452,8 +533,12 @@ msgstr "B<--algorithm>I<number>B<=>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:193
-msgid "selects a non-standard algorithm to be used by the AI controller for this side. Available values: B<idle_ai> and B<sample_ai>."
-msgstr "selects a non-standard algorithm to be used by the AI controller for this side. Available values: B<idle_ai> and B<sample_ai>."
+msgid ""
+"selects a non-standard algorithm to be used by the AI controller for this "
+"side. Available values: B<idle_ai> and B<sample_ai>."
+msgstr ""
+"selects a non-standard algorithm to be used by the AI controller for this "
+"side. Available values: B<idle_ai> and B<sample_ai>."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:193
@@ -463,8 +548,10 @@ msgstr "B<--controller>I<number>B<=>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:199
-msgid "selects the controller for this side. Available values: B<human> and B<ai>."
-msgstr "selects the controller for this side. Available values: B<human> and B<ai>."
+msgid ""
+"selects the controller for this side. Available values: B<human> and B<ai>."
+msgstr ""
+"selects the controller for this side. Available values: B<human> and B<ai>."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:199
@@ -474,8 +561,14 @@ msgstr "B<--era=>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:206
-msgid "use this option to play in the selected era instead of the B<Default> era. The era is chosen by an id. Eras are described in the B<data/multiplayer/eras.cfg> file."
-msgstr "use this option to play in the selected era instead of the B<Default> era. The era is chosen by an id. Eras are described in the B<data/multiplayer/eras.cfg> file."
+msgid ""
+"use this option to play in the selected era instead of the B<Default> era. "
+"The era is chosen by an id. Eras are described in the B<data/multiplayer/"
+"eras.cfg> file."
+msgstr ""
+"use this option to play in the selected era instead of the B<Default> era. "
+"The era is chosen by an id. Eras are described in the B<data/multiplayer/"
+"eras.cfg> file."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:206
@@ -485,8 +578,14 @@ msgstr "B<--exit-at-end>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:210
-msgid "exits once the scenario is over, without displaying victory/defeat dialog which requires the user to click OK.  This is also used for scriptable benchmarking."
-msgstr "exits once the scenario is over, without displaying victory/defeat dialog which requires the user to click OK.  This is also used for scriptable benchmarking."
+msgid ""
+"exits once the scenario is over, without displaying victory/defeat dialog "
+"which requires the user to click OK.  This is also used for scriptable "
+"benchmarking."
+msgstr ""
+"exits once the scenario is over, without displaying victory/defeat dialog "
+"which requires the user to click OK.  This is also used for scriptable "
+"benchmarking."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:210
@@ -496,8 +595,12 @@ msgstr "B<--nogui>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:215
-msgid "runs the game without the GUI. Must appear before B<--multiplayer> to have the desired effect."
-msgstr "runs the game without the GUI. Must appear before B<--multiplayer> to have the desired effect."
+msgid ""
+"runs the game without the GUI. Must appear before B<--multiplayer> to have "
+"the desired effect."
+msgstr ""
+"runs the game without the GUI. Must appear before B<--multiplayer> to have "
+"the desired effect."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:215
@@ -507,8 +610,14 @@ msgstr "B<--parm>I<number>B<=>I<name>B<:>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:224
-msgid "sets additional parameters for this side. This parameter depends on the options used with B<--controller> and B<--algorithm>.  It should only be useful for people designing their own AI. (not yet documented completely)"
-msgstr "sets additional parameters for this side. This parameter depends on the options used with B<--controller> and B<--algorithm>.  It should only be useful for people designing their own AI. (not yet documented completely)"
+msgid ""
+"sets additional parameters for this side. This parameter depends on the "
+"options used with B<--controller> and B<--algorithm>.  It should only be "
+"useful for people designing their own AI. (not yet documented completely)"
+msgstr ""
+"sets additional parameters for this side. This parameter depends on the "
+"options used with B<--controller> and B<--algorithm>.  It should only be "
+"useful for people designing their own AI. (not yet documented completely)"
 
 # type: TP
 #: ../../doc/man/wesnoth.6:224
@@ -518,8 +627,12 @@ msgstr "B<--scenario=>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:228
-msgid "selects a multiplayer scenario by id. The default scenario id is B<multiplayer_The_Freelands>."
-msgstr "selects a multiplayer scenario by id. The default scenario id is B<multiplayer_The_Freelands>."
+msgid ""
+"selects a multiplayer scenario by id. The default scenario id is "
+"B<multiplayer_The_Freelands>."
+msgstr ""
+"selects a multiplayer scenario by id. The default scenario id is "
+"B<multiplayer_The_Freelands>."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:228
@@ -529,8 +642,12 @@ msgstr "B<--side>I<number>B<=>I<value>"
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:233
-msgid "selects a faction of the current era for this side. The faction is chosen by an id. Factions are described in the data/multiplayer.cfg file."
-msgstr "selects a faction of the current era for this side. The faction is chosen by an id. Factions are described in the data/multiplayer.cfg file."
+msgid ""
+"selects a faction of the current era for this side. The faction is chosen by "
+"an id. Factions are described in the data/multiplayer.cfg file."
+msgstr ""
+"selects a faction of the current era for this side. The faction is chosen by "
+"an id. Factions are described in the data/multiplayer.cfg file."
 
 # type: TP
 #: ../../doc/man/wesnoth.6:233
@@ -541,11 +658,11 @@ msgstr "B<--turns=>I<value>"
 # type: Plain text
 #: ../../doc/man/wesnoth.6:237
 msgid "sets the number of turns for the chosen scenario. The default is B<50>."
-msgstr "sets the number of turns for the chosen scenario. The default is B<50>."
+msgstr ""
+"sets the number of turns for the chosen scenario. The default is B<50>."
 
 # type: SH
-#: ../../doc/man/wesnoth.6:238
-#: ../../doc/man/wesnothd.6:248
+#: ../../doc/man/wesnoth.6:238 ../../doc/man/wesnothd.6:248
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTHOR"
@@ -557,42 +674,52 @@ msgstr "Written by David White E<lt>davidnwhite@verizon.netE<gt>."
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:243
-msgid "Edited by Nils Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon.netE<gt> and Soliton E<lt>soliton.de@gmail.comE<gt>."
-msgstr "Edited by Nils Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon.netE<gt> and Soliton E<lt>soliton.de@gmail.comE<gt>."
+msgid ""
+"Edited by Nils Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon."
+"netE<gt> and Soliton E<lt>soliton.de@gmail.comE<gt>."
+msgstr ""
+"Edited by Nils Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon."
+"netE<gt> and Soliton E<lt>soliton.de@gmail.comE<gt>."
 
 # type: Plain text
 #: ../../doc/man/wesnoth.6:245
-msgid "This manual page was originally written by Cyril Bouthors E<lt>cyril@bouthors.orgE<gt>."
-msgstr "This manual page was originally written by Cyril Bouthors E<lt>cyril@bouthors.orgE<gt>."
+msgid ""
+"This manual page was originally written by Cyril Bouthors "
+"E<lt>cyril@bouthors.orgE<gt>."
+msgstr ""
+"This manual page was originally written by Cyril Bouthors "
+"E<lt>cyril@bouthors.orgE<gt>."
 
 # type: Plain text
-#: ../../doc/man/wesnoth.6:247
-#: ../../doc/man/wesnothd.6:255
+#: ../../doc/man/wesnoth.6:247 ../../doc/man/wesnothd.6:255
 msgid "Visit the official homepage: http://www.wesnoth.org/"
 msgstr "Visit the official homepage: http://www.wesnoth.org/"
 
 # type: SH
-#: ../../doc/man/wesnoth.6:248
-#: ../../doc/man/wesnothd.6:256
+#: ../../doc/man/wesnoth.6:248 ../../doc/man/wesnothd.6:256
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
-#: ../../doc/man/wesnoth.6:251
-#: ../../doc/man/wesnothd.6:259
+#: ../../doc/man/wesnoth.6:251 ../../doc/man/wesnothd.6:259
 msgid "Copyright \\(co 2003-2007 David White E<lt>davidnwhite@verizon.netE<gt>"
-msgstr "Copyright \\(co 2003-2007 David White E<lt>davidnwhite@verizon.netE<gt>"
+msgstr ""
+"Copyright \\(co 2003-2007 David White E<lt>davidnwhite@verizon.netE<gt>"
 
 # type: Plain text
-#: ../../doc/man/wesnoth.6:254
-#: ../../doc/man/wesnothd.6:262
-msgid "This is Free Software; this software is licensed under the GPL version 2, as published by the Free Software Foundation.  There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-msgstr "This is Free Software; this software is licensed under the GPL version 2, as published by the Free Software Foundation.  There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+#: ../../doc/man/wesnoth.6:254 ../../doc/man/wesnothd.6:262
+msgid ""
+"This is Free Software; this software is licensed under the GPL version 2, as "
+"published by the Free Software Foundation.  There is NO warranty; not even "
+"for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+"This is Free Software; this software is licensed under the GPL version 2, as "
+"published by the Free Software Foundation.  There is NO warranty; not even "
+"for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 # type: SH
-#: ../../doc/man/wesnoth.6:255
-#: ../../doc/man/wesnothd.6:263
+#: ../../doc/man/wesnoth.6:255 ../../doc/man/wesnothd.6:263
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SEE ALSO"
@@ -627,8 +754,12 @@ msgstr "wesnothd - Battle for B<Wesnoth> multiplayer network daemon"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:36
-msgid "B<wesnothd> [\\|B<-dv>\\|] [\\|B<-c> I<path>\\|] [\\|B<-p> I<port>\\|] [\\|B<-t> I<number>\\|] [\\|B<-T> I<number>\\|]"
-msgstr "B<wesnothd> [\\|B<-dv>\\|] [\\|B<-c> I<path>\\|] [\\|B<-p> I<port>\\|] [\\|B<-t> I<number>\\|] [\\|B<-T> I<number>\\|]"
+msgid ""
+"B<wesnothd> [\\|B<-dv>\\|] [\\|B<-c> I<path>\\|] [\\|B<-p> I<port>\\|] [\\|"
+"B<-t> I<number>\\|] [\\|B<-T> I<number>\\|]"
+msgstr ""
+"B<wesnothd> [\\|B<-dv>\\|] [\\|B<-c> I<path>\\|] [\\|B<-p> I<port>\\|] [\\|"
+"B<-t> I<number>\\|] [\\|B<-T> I<number>\\|]"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:39
@@ -637,8 +768,14 @@ msgstr "B<wesnothd> B<-V>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:44
-msgid "Manages Battle for Wesnoth multiplayer games. See http://www.wesnoth.org/wiki/ServerAdministration on what commands the server accepts via the wesnoth client (/query ...) or the fifo."
-msgstr "Manages Battle for Wesnoth multiplayer games. See http://www.wesnoth.org/wiki/ServerAdministration on what commands the server accepts via the wesnoth client (/query ...) or the fifo."
+msgid ""
+"Manages Battle for Wesnoth multiplayer games. See http://www.wesnoth.org/"
+"wiki/ServerAdministration on what commands the server accepts via the "
+"wesnoth client (/query ...) or the fifo."
+msgstr ""
+"Manages Battle for Wesnoth multiplayer games. See http://www.wesnoth.org/"
+"wiki/ServerAdministration on what commands the server accepts via the "
+"wesnoth client (/query ...) or the fifo."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:47
@@ -648,8 +785,14 @@ msgstr "B<-c\\ >I<path>B<,\\ --config>I<\\ path>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:52
-msgid "tells wesnothd where to find the config file to use. See the section B<SERVER CONFIG> below for the syntax. You can reload the config with sending SIGHUP to the server process."
-msgstr "tells wesnothd where to find the config file to use. See the section B<SERVER CONFIG> below for the syntax. You can reload the config with sending SIGHUP to the server process."
+msgid ""
+"tells wesnothd where to find the config file to use. See the section "
+"B<SERVER CONFIG> below for the syntax. You can reload the config with "
+"sending SIGHUP to the server process."
+msgstr ""
+"tells wesnothd where to find the config file to use. See the section "
+"B<SERVER CONFIG> below for the syntax. You can reload the config with "
+"sending SIGHUP to the server process."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:52
@@ -669,8 +812,16 @@ msgstr "tells you what the command line options do."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:72
-msgid "sets the severity level of the log domains.  B<all> can be used to match any log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ B<debug>.  By default the B<error> level is used and the B<info> level for the B<server> domain."
-msgstr "sets the severity level of the log domains.  B<all> can be used to match any log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ B<debug>.  By default the B<error> level is used and the B<info> level for the B<server> domain."
+msgid ""
+"sets the severity level of the log domains.  B<all> can be used to match any "
+"log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ "
+"B<debug>.  By default the B<error> level is used and the B<info> level for "
+"the B<server> domain."
+msgstr ""
+"sets the severity level of the log domains.  B<all> can be used to match any "
+"log domain. Available levels: B<error>,\\ B<warning>,\\ B<info>,\\ "
+"B<debug>.  By default the B<error> level is used and the B<info> level for "
+"the B<server> domain."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:72
@@ -680,8 +831,12 @@ msgstr "B<-p\\ >I<port>B<,\\ --port>I<\\ port>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:77
-msgid "binds the server to the specified port. If no port is specified, port B<15000> will be used."
-msgstr "binds the server to the specified port. If no port is specified, port B<15000> will be used."
+msgid ""
+"binds the server to the specified port. If no port is specified, port "
+"B<15000> will be used."
+msgstr ""
+"binds the server to the specified port. If no port is specified, port "
+"B<15000> will be used."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:77
@@ -691,8 +846,12 @@ msgstr "B<-t\\ >I<number>B<,\\ --threads>I<\\ number>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:81
-msgid "sets the maximum number of waiting worker threads for network I/O to n (default: B<5>,\\ max:\\ B<30>)."
-msgstr "sets the maximum number of waiting worker threads for network I/O to n (default: B<5>,\\ max:\\ B<30>)."
+msgid ""
+"sets the maximum number of waiting worker threads for network I/O to n "
+"(default: B<5>,\\ max:\\ B<30>)."
+msgstr ""
+"sets the maximum number of waiting worker threads for network I/O to n "
+"(default: B<5>,\\ max:\\ B<30>)."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:81
@@ -702,8 +861,12 @@ msgstr "B<-T\\ >I<number>B<,\\ --max-threads>I<\\ number>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:88
-msgid "sets the maximum number of worker threads that will be created.  If set to B<0> there will be no limit (default: B<0>)."
-msgstr "sets the maximum number of worker threads that will be created.  If set to B<0> there will be no limit (default: B<0>)."
+msgid ""
+"sets the maximum number of worker threads that will be created.  If set to "
+"B<0> there will be no limit (default: B<0>)."
+msgstr ""
+"sets the maximum number of worker threads that will be created.  If set to "
+"B<0> there will be no limit (default: B<0>)."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:88
@@ -773,8 +936,12 @@ msgstr "B<ban_save_file>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:114
-msgid "Full or relative path to a (gzip compressed) file that the server can read and write.  Bans will be saved to this file and read again on server start."
-msgstr "Full or relative path to a (gzip compressed) file that the server can read and write.  Bans will be saved to this file and read again on server start."
+msgid ""
+"Full or relative path to a (gzip compressed) file that the server can read "
+"and write.  Bans will be saved to this file and read again on server start."
+msgstr ""
+"Full or relative path to a (gzip compressed) file that the server can read "
+"and write.  Bans will be saved to this file and read again on server start."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:114
@@ -784,8 +951,12 @@ msgstr "B<connections_allowed>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:117
-msgid "The number of allowed connections from the same IP. B<0> means infinite. (default: B<5>)"
-msgstr "The number of allowed connections from the same IP. B<0> means infinite. (default: B<5>)"
+msgid ""
+"The number of allowed connections from the same IP. B<0> means infinite. "
+"(default: B<5>)"
+msgstr ""
+"The number of allowed connections from the same IP. B<0> means infinite. "
+"(default: B<5>)"
 
 # type: TP
 #: ../../doc/man/wesnothd.6:117
@@ -795,8 +966,16 @@ msgstr "B<disallow_names>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:124
-msgid "Names/nicks that are not accepted by the server. `*' and `?' from wildcard patterns are supported. See B<glob>(7)  for more details.  Default values (used if nothing is specified) are: B<*admin*,*admln*,*server*,ai,ai?,computer,human,network,player>."
-msgstr "Names/nicks that are not accepted by the server. `*' and `?' from wildcard patterns are supported. See B<glob>(7)  for more details.  Default values (used if nothing is specified) are: B<*admin*,*admln*,*server*,ai,ai?,computer,human,network,player>."
+msgid ""
+"Names/nicks that are not accepted by the server. `*' and `?' from wildcard "
+"patterns are supported. See B<glob>(7)  for more details.  Default values "
+"(used if nothing is specified) are: B<*admin*,*admln*,*server*,ai,ai?,"
+"computer,human,network,player>."
+msgstr ""
+"Names/nicks that are not accepted by the server. `*' and `?' from wildcard "
+"patterns are supported. See B<glob>(7)  for more details.  Default values "
+"(used if nothing is specified) are: B<*admin*,*admln*,*server*,ai,ai?,"
+"computer,human,network,player>."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:124
@@ -806,8 +985,14 @@ msgstr "B<fifo_path>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:128
-msgid "The path to the fifo you can echo server commands into (same as /query ... from wesnoth).  If not specified defaults to the compile-time specified path (default: /var/run/socket/wesnothd/socket)."
-msgstr "The path to the fifo you can echo server commands into (same as /query ... from wesnoth).  If not specified defaults to the compile-time specified path (default: /var/run/socket/wesnothd/socket)."
+msgid ""
+"The path to the fifo you can echo server commands into (same as /query ... "
+"from wesnoth).  If not specified defaults to the compile-time specified path "
+"(default: /var/run/socket/wesnothd/socket)."
+msgstr ""
+"The path to the fifo you can echo server commands into (same as /query ... "
+"from wesnoth).  If not specified defaults to the compile-time specified path "
+"(default: /var/run/socket/wesnothd/socket)."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:128
@@ -817,8 +1002,10 @@ msgstr "B<max_messages>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:131
-msgid "The number of allowed messages in B<messages_time_period>. (default: B<4>)"
-msgstr "The number of allowed messages in B<messages_time_period>. (default: B<4>)"
+msgid ""
+"The number of allowed messages in B<messages_time_period>. (default: B<4>)"
+msgstr ""
+"The number of allowed messages in B<messages_time_period>. (default: B<4>)"
 
 # type: TP
 #: ../../doc/man/wesnothd.6:131
@@ -828,8 +1015,12 @@ msgstr "B<messages_time_period>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:134
-msgid "The time period (in seconds) message flooding is detected in. (default: B<10> seconds)"
-msgstr "The time period (in seconds) message flooding is detected in. (default: B<10> seconds)"
+msgid ""
+"The time period (in seconds) message flooding is detected in. (default: "
+"B<10> seconds)"
+msgstr ""
+"The time period (in seconds) message flooding is detected in. (default: "
+"B<10> seconds)"
 
 # type: TP
 #: ../../doc/man/wesnothd.6:134
@@ -850,8 +1041,10 @@ msgstr "B<passwd>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:140
-msgid "The password used to gain admin privileges. Usually it starts with `admin '."
-msgstr "The password used to gain admin privileges. Usually it starts with `admin '."
+msgid ""
+"The password used to gain admin privileges. Usually it starts with `admin '."
+msgstr ""
+"The password used to gain admin privileges. Usually it starts with `admin '."
 
 #: ../../doc/man/wesnothd.6:140
 #, no-wrap
@@ -859,8 +1052,14 @@ msgid "B<replay_save_path>"
 msgstr "B<replay_save_path>"
 
 #: ../../doc/man/wesnothd.6:143
-msgid "The directory where the server stores game replays. (Don't forget the trailing /!) Defaults to `' which means the directory wesnothd was started in."
-msgstr "The directory where the server stores game replays. (Don't forget the trailing /!) Defaults to `' which means the directory wesnothd was started in."
+msgid ""
+"The directory where the server stores game replays. (Don't forget the "
+"trailing /!) Defaults to `' which means the directory wesnothd was started "
+"in."
+msgstr ""
+"The directory where the server stores game replays. (Don't forget the "
+"trailing /!) Defaults to `' which means the directory wesnothd was started "
+"in."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:143
@@ -870,8 +1069,12 @@ msgstr "B<restart_command>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:146
-msgid "The command that the server uses to start a new server process via the `restart' command. (Can only be issued via the fifo.)"
-msgstr "The command that the server uses to start a new server process via the `restart' command. (Can only be issued via the fifo.)"
+msgid ""
+"The command that the server uses to start a new server process via the "
+"`restart' command. (Can only be issued via the fifo.)"
+msgstr ""
+"The command that the server uses to start a new server process via the "
+"`restart' command. (Can only be issued via the fifo.)"
 
 #: ../../doc/man/wesnothd.6:146
 #, no-wrap
@@ -879,8 +1082,12 @@ msgid "B<save_replays>"
 msgstr "B<save_replays>"
 
 #: ../../doc/man/wesnothd.6:149
-msgid "Defines whether the server will automatically save replays of games. (default: B<false>)"
-msgstr "Defines whether the server will automatically save replays of games. (default: B<false>)"
+msgid ""
+"Defines whether the server will automatically save replays of games. "
+"(default: B<false>)"
+msgstr ""
+"Defines whether the server will automatically save replays of games. "
+"(default: B<false>)"
 
 # type: TP
 #: ../../doc/man/wesnothd.6:149
@@ -890,8 +1097,14 @@ msgstr "B<versions_accepted>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:153
-msgid "A comma separated list of version strings to be accepted by the server. `*' and `?' from wildcard patterns are supported.  (defaults to the corresponding wesnoth version)"
-msgstr "A comma separated list of version strings to be accepted by the server. `*' and `?' from wildcard patterns are supported.  (defaults to the corresponding wesnoth version)"
+msgid ""
+"A comma separated list of version strings to be accepted by the server. `*' "
+"and `?' from wildcard patterns are supported.  (defaults to the "
+"corresponding wesnoth version)"
+msgstr ""
+"A comma separated list of version strings to be accepted by the server. `*' "
+"and `?' from wildcard patterns are supported.  (defaults to the "
+"corresponding wesnoth version)"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:155
@@ -906,8 +1119,18 @@ msgstr "B<user_handler>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:160
-msgid "The name of the user handler to use. Currently available user handlers are 'forum' (to connect wesnothd to a phpbb forum database) and 'sample' (a sample implementation of the user handler interface, if you use this on anything real you are insane). The default value is 'forum'. You must also add a B<[user_handler]> section, see below."
-msgstr "The name of the user handler to use. Currently available user handlers are 'forum' (to connect wesnothd to a phpbb forum database) and 'sample' (a sample implementation of the user handler interface, if you use this on anything real you are insane). The default value is 'forum'. You must also add a B<[user_handler]> section, see below."
+msgid ""
+"The name of the user handler to use. Currently available user handlers are "
+"'forum' (to connect wesnothd to a phpbb forum database) and 'sample' (a "
+"sample implementation of the user handler interface, if you use this on "
+"anything real you are insane). The default value is 'forum'. You must also "
+"add a B<[user_handler]> section, see below."
+msgstr ""
+"The name of the user handler to use. Currently available user handlers are "
+"'forum' (to connect wesnothd to a phpbb forum database) and 'sample' (a "
+"sample implementation of the user handler interface, if you use this on "
+"anything real you are insane). The default value is 'forum'. You must also "
+"add a B<[user_handler]> section, see below."
 
 # type: SS
 #: ../../doc/man/wesnothd.6:161
@@ -917,8 +1140,12 @@ msgstr "Global tags:"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:166
-msgid "B<[redirect]> A tag to specify a server to redirect certain client versions to."
-msgstr "B<[redirect]> A tag to specify a server to redirect certain client versions to."
+msgid ""
+"B<[redirect]> A tag to specify a server to redirect certain client versions "
+"to."
+msgstr ""
+"B<[redirect]> A tag to specify a server to redirect certain client versions "
+"to."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:167
@@ -950,13 +1177,21 @@ msgstr "B<version>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:178
-msgid "A comma separated list of versions to redirect. Behaves the same way as B<versions_accepted> in regard to wildcard patterns."
-msgstr "A comma separated list of versions to redirect. Behaves the same way as B<versions_accepted> in regard to wildcard patterns."
+msgid ""
+"A comma separated list of versions to redirect. Behaves the same way as "
+"B<versions_accepted> in regard to wildcard patterns."
+msgstr ""
+"A comma separated list of versions to redirect. Behaves the same way as "
+"B<versions_accepted> in regard to wildcard patterns."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:182
-msgid "B<[ban_time]> A tag to define convenient keywords for temporary ban time lengths."
-msgstr "B<[ban_time]> A tag to define convenient keywords for temporary ban time lengths."
+msgid ""
+"B<[ban_time]> A tag to define convenient keywords for temporary ban time "
+"lengths."
+msgstr ""
+"B<[ban_time]> A tag to define convenient keywords for temporary ban time "
+"lengths."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:183
@@ -977,18 +1212,42 @@ msgstr "B<time>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:192
-msgid "The time length definition.  The format is: %d[%s[%d%s[...]]] where %s is s (seconds), m (minutes), h (hours), D (days), M (months) or Y (years) and %d is a number.  If no time modifier is given minutes (m) are assumed.  Example: time=\"1D12h30m\" results in a ban time of 1 day, 12 hours and 30 minutes."
-msgstr "The time length definition.  The format is: %d[%s[%d%s[...]]] where %s is s (seconds), m (minutes), h (hours), D (days), M (months) or Y (years) and %d is a number.  If no time modifier is given minutes (m) are assumed.  Example: time=\"1D12h30m\" results in a ban time of 1 day, 12 hours and 30 minutes."
+msgid ""
+"The time length definition.  The format is: %d[%s[%d%s[...]]] where %s is s "
+"(seconds), m (minutes), h (hours), D (days), M (months) or Y (years) and %d "
+"is a number.  If no time modifier is given minutes (m) are assumed.  "
+"Example: time=\"1D12h30m\" results in a ban time of 1 day, 12 hours and 30 "
+"minutes."
+msgstr ""
+"The time length definition.  The format is: %d[%s[%d%s[...]]] where %s is s "
+"(seconds), m (minutes), h (hours), D (days), M (months) or Y (years) and %d "
+"is a number.  If no time modifier is given minutes (m) are assumed.  "
+"Example: time=\"1D12h30m\" results in a ban time of 1 day, 12 hours and 30 "
+"minutes."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:198
-msgid "B<[proxy]> A tag to tell the server to act as a proxy and forward the connected client's requests to the specified server.  Accepts the same keys as B<[redirect]>."
-msgstr "B<[proxy]> A tag to tell the server to act as a proxy and forward the connected client's requests to the specified server.  Accepts the same keys as B<[redirect]>."
+msgid ""
+"B<[proxy]> A tag to tell the server to act as a proxy and forward the "
+"connected client's requests to the specified server.  Accepts the same keys "
+"as B<[redirect]>."
+msgstr ""
+"B<[proxy]> A tag to tell the server to act as a proxy and forward the "
+"connected client's requests to the specified server.  Accepts the same keys "
+"as B<[redirect]>."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:204
-msgid "B<[user_handler]> Configures the user handler. Available keys vary depending on which user handler is set with the B<user_handler> key. If no [user_handler] section is present in the configuration the server will run without any nick registration service."
-msgstr "B<[user_handler]> Configures the user handler. Available keys vary depending on which user handler is set with the B<user_handler> key. If no [user_handler] section is present in the configuration the server will run without any nick registration service."
+msgid ""
+"B<[user_handler]> Configures the user handler. Available keys vary depending "
+"on which user handler is set with the B<user_handler> key. If no "
+"[user_handler] section is present in the configuration the server will run "
+"without any nick registration service."
+msgstr ""
+"B<[user_handler]> Configures the user handler. Available keys vary depending "
+"on which user handler is set with the B<user_handler> key. If no "
+"[user_handler] section is present in the configuration the server will run "
+"without any nick registration service."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:205
@@ -1020,8 +1279,12 @@ msgstr "B<db_user>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:214
-msgid "(for user_handler=forum) The name of the user under which to log into the database"
-msgstr "(for user_handler=forum) The name of the user under which to log into the database"
+msgid ""
+"(for user_handler=forum) The name of the user under which to log into the "
+"database"
+msgstr ""
+"(for user_handler=forum) The name of the user under which to log into the "
+"database"
 
 # type: TP
 #: ../../doc/man/wesnothd.6:214
@@ -1042,8 +1305,14 @@ msgstr "B<db_users_table>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:220
-msgid "(for user_handler=forum) The name of the table in which your phpbb forums saves its user data. Most likely this will be E<lt>table-prefixE<gt>_users (e.g. phpbb3_users)."
-msgstr "(for user_handler=forum) The name of the table in which your phpbb forums saves its user data. Most likely this will be E<lt>table-prefixE<gt>_users (e.g. phpbb3_users)."
+msgid ""
+"(for user_handler=forum) The name of the table in which your phpbb forums "
+"saves its user data. Most likely this will be E<lt>table-prefixE<gt>_users "
+"(e.g. phpbb3_users)."
+msgstr ""
+"(for user_handler=forum) The name of the table in which your phpbb forums "
+"saves its user data. Most likely this will be E<lt>table-prefixE<gt>_users "
+"(e.g. phpbb3_users)."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:220
@@ -1053,8 +1322,18 @@ msgstr "B<db_extra_table>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:224
-msgid "(for user_handler=forum) The name of the table in which wesnothd will save its own data about users. You will have to create this table manually, e.g.: CREATE TABLE E<lt>table-nameE<gt>(username VARCHAR(255) PRIMARY KEY, user_lastvisit INT UNSIGNED NOT NULL DEFAULT 0, user_is_moderator TINYINT(4) NOT NULL DEFAULT 0);"
-msgstr "(for user_handler=forum) The name of the table in which wesnothd will save its own data about users. You will have to create this table manually, e.g.: CREATE TABLE E<lt>table-nameE<gt>(username VARCHAR(255) PRIMARY KEY, user_lastvisit INT UNSIGNED NOT NULL DEFAULT 0, user_is_moderator TINYINT(4) NOT NULL DEFAULT 0);"
+msgid ""
+"(for user_handler=forum) The name of the table in which wesnothd will save "
+"its own data about users. You will have to create this table manually, e.g.: "
+"CREATE TABLE E<lt>table-nameE<gt>(username VARCHAR(255) PRIMARY KEY, "
+"user_lastvisit INT UNSIGNED NOT NULL DEFAULT 0, user_is_moderator TINYINT(4) "
+"NOT NULL DEFAULT 0);"
+msgstr ""
+"(for user_handler=forum) The name of the table in which wesnothd will save "
+"its own data about users. You will have to create this table manually, e.g.: "
+"CREATE TABLE E<lt>table-nameE<gt>(username VARCHAR(255) PRIMARY KEY, "
+"user_lastvisit INT UNSIGNED NOT NULL DEFAULT 0, user_is_moderator TINYINT(4) "
+"NOT NULL DEFAULT 0);"
 
 # type: TP
 #: ../../doc/man/wesnothd.6:224
@@ -1064,13 +1343,21 @@ msgstr "B<user_expiration>"
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:227
-msgid "(for user_handler=sample) The time after which a registered nick expires (in days)."
-msgstr "(for user_handler=sample) The time after which a registered nick expires (in days)."
+msgid ""
+"(for user_handler=sample) The time after which a registered nick expires (in "
+"days)."
+msgstr ""
+"(for user_handler=sample) The time after which a registered nick expires (in "
+"days)."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:231
-msgid "B<[mail]> Configures an SMTP server through which the user handler can send mail. Currently only used by the sample user handler."
-msgstr "B<[mail]> Configures an SMTP server through which the user handler can send mail. Currently only used by the sample user handler."
+msgid ""
+"B<[mail]> Configures an SMTP server through which the user handler can send "
+"mail. Currently only used by the sample user handler."
+msgstr ""
+"B<[mail]> Configures an SMTP server through which the user handler can send "
+"mail. Currently only used by the sample user handler."
 
 # type: TP
 #: ../../doc/man/wesnothd.6:232
@@ -1129,11 +1416,20 @@ msgstr "The port on which your mail server is running. Default is 25."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:253
-msgid "Written by David White E<lt>davidnwhite@verizon.netE<gt>.  Edited by Nils Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon.netE<gt>, Soliton E<lt>soliton.de@gmail.comE<gt> and Thomas Baumhauer E<lt>thomas.baumhauer@gmail.comE<gt>.  This manual page was originally written by Cyril Bouthors E<lt>cyril@bouthors.orgE<gt>."
-msgstr "Written by David White E<lt>davidnwhite@verizon.netE<gt>.  Edited by Nils Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon.netE<gt>, Soliton E<lt>soliton.de@gmail.comE<gt> and Thomas Baumhauer E<lt>thomas.baumhauer@gmail.comE<gt>.  This manual page was originally written by Cyril Bouthors E<lt>cyril@bouthors.orgE<gt>."
+msgid ""
+"Written by David White E<lt>davidnwhite@verizon.netE<gt>.  Edited by Nils "
+"Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon.netE<gt>, "
+"Soliton E<lt>soliton.de@gmail.comE<gt> and Thomas Baumhauer E<lt>thomas."
+"baumhauer@gmail.comE<gt>.  This manual page was originally written by Cyril "
+"Bouthors E<lt>cyril@bouthors.orgE<gt>."
+msgstr ""
+"Written by David White E<lt>davidnwhite@verizon.netE<gt>.  Edited by Nils "
+"Kneuper E<lt>crazy-ivanovic@gmx.netE<gt>, ott E<lt>ott@gaon.netE<gt>, "
+"Soliton E<lt>soliton.de@gmail.comE<gt> and Thomas Baumhauer E<lt>thomas."
+"baumhauer@gmail.comE<gt>.  This manual page was originally written by Cyril "
+"Bouthors E<lt>cyril@bouthors.orgE<gt>."
 
 # type: Plain text
 #: ../../doc/man/wesnothd.6:266
 msgid "B<wesnoth>(6), B<wesnoth_editor>(6)"
 msgstr "B<wesnoth>(6), B<wesnoth_editor>(6)"
-
diff --git a/po/wesnoth-sotbe/en_GB.po b/po/wesnoth-sotbe/en_GB.po
index 0de92da1a2e..897d8545426 100644
--- a/po/wesnoth-sotbe/en_GB.po
+++ b/po/wesnoth-sotbe/en_GB.po
@@ -3655,8 +3655,9 @@ msgstr "I do not. Their bodies are frozen in the lake just over there."
 
 #. [message]: speaker=Kapou'e
 #: data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg:643
+#, fuzzy
 msgid "You had better go check it out."
-msgstr "You had better go check it out."
+msgstr "You had better go look."
 
 #. [message]: speaker=second_unit
 #: data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg:649
diff --git a/po/wesnoth-thot/en_GB.po b/po/wesnoth-thot/en_GB.po
index 25196ef2f00..de7d499ff3a 100644
--- a/po/wesnoth-thot/en_GB.po
+++ b/po/wesnoth-thot/en_GB.po
@@ -2137,17 +2137,19 @@ msgstr ""
 
 #. [message]: speaker=unit
 #: data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg:790
+#, fuzzy
 msgid ""
 "An old caved in passage way. Perhaps if we clear away some of this rubble we "
 "may be able to get through..."
 msgstr ""
-"An old caved in passage way. Perhaps if we clear away some of this rubble we "
+"An old caved in passageway. Perhaps if we clear away some of this rubble we "
 "may be able to get through..."
 
 #. [message]: speaker=unit
 #: data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg:811
+#, fuzzy
 msgid "Another old caved-in passage way..."
-msgstr "Another old caved-in passage way..."
+msgstr "Another old caved-in passageway..."
 
 #. [unit]: type=Dwarvish Steelclad, id=Trisi
 #: data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg:847
diff --git a/po/wesnoth-units/en_GB.po b/po/wesnoth-units/en_GB.po
index 60e8190da62..6d4915c2648 100644
--- a/po/wesnoth-units/en_GB.po
+++ b/po/wesnoth-units/en_GB.po
@@ -2641,8 +2641,8 @@ msgid ""
 "SPECIAL_NOTE^ Silver Magi are well-attuned to their magical natures and are "
 "highly resistant to non-physical damage."
 msgstr ""
-"SPECIAL_NOTE^ Silver Magi are well-attuned to their magical natures and are "
-"highly resistant to non-physical damage."
+" Silver Magi are well-attuned to their magical natures and are highly "
+"resistant to non-physical damage."
 
 #. [unit_type]: id=Silver Mage, race=human
 #: data/core/units/humans/Mage_Silver.cfg:24
@@ -5092,13 +5092,13 @@ msgstr ""
 #~ "ammunition. Outlaws are somewhat ill at ease fighting during the day, "
 #~ "preferring the cover of nightfall."
 #~ msgstr ""
-#~ "female^After some years of service, former 'footpads' rise up in the "
-#~ "ranks of their fellow outlaws. Having proven themselves in combat, they "
-#~ "are given more dangerous tasks, and a greater share of the spoils. Though "
-#~ "many opponents would mock their choice of weaponry, the outlaws are well "
-#~ "aware of its deadly capacity, and also of the ready availability of "
-#~ "ammunition. Outlaws are somewhat ill at ease fighting during the day, "
-#~ "preferring the cover of nightfall."
+#~ "After some years of service, former 'footpads' rise up in the ranks of "
+#~ "their fellow outlaws. Having proven themselves in combat, they are given "
+#~ "more dangerous tasks, and a greater share of the spoils. Though many "
+#~ "opponents would mock their choice of weaponry, the outlaws are well aware "
+#~ "of its deadly capacity, and also of the ready availability of ammunition. "
+#~ "Outlaws are somewhat ill at ease fighting during the day, preferring the "
+#~ "cover of nightfall."
 
 #~ msgid ""
 #~ "female^These petty criminals are often derisively called 'footpads' by "
@@ -5108,9 +5108,9 @@ msgstr ""
 #~ "despite their inferior weaponry they are quite good at harrying their "
 #~ "enemies, especially under cover of darkness."
 #~ msgstr ""
-#~ "female^These petty criminals are often derisively called 'footpads' by "
-#~ "their superiors, for they are tasked with any job that requires a great "
-#~ "deal of running around, often being employed as couriers, or scouts. The "
+#~ "These petty criminals are often derisively called 'footpads' by their "
+#~ "superiors, for they are tasked with any job that requires a great deal of "
+#~ "running around, often being employed as couriers, or scouts. The "
 #~ "endurance and agility they gain from this serves them well in combat, and "
 #~ "despite their inferior weaponry they are quite good at harrying their "
 #~ "enemies, especially under cover of darkness."
@@ -5121,7 +5121,7 @@ msgstr ""
 #~ "their element, but are no match for the sheer numbers that law-abiding "
 #~ "soldiery can throw at them."
 #~ msgstr ""
-#~ "female^Veteran criminals become notorious for both their ruthlessness and "
+#~ "Veteran criminals become notorious for both their ruthlessness and "
 #~ "ability to elude capture. They can be dangerous and rightly fearful in "
 #~ "their element, but are no match for the sheer numbers that law-abiding "
 #~ "soldiery can throw at them."
@@ -5138,13 +5138,13 @@ msgstr ""
 #~ "In such condition, their only weapon is the craft they have so committed "
 #~ "themselves to learning."
 #~ msgstr ""
-#~ "female^To attract any practitioners, the lure of black magic must be a "
-#~ "great prize indeed, for anyone caught practicing the art in the civilized "
-#~ "world is subject to a death sentence. And yet there are those who pursue "
-#~ "this art, for the prize offered is nothing less than immortality. Hidden "
-#~ "away in secret cults, or initiated into the dark orders of the "
-#~ "underworld, the training which these fanatics must endure often drives "
-#~ "them to exhaustion and enfeeblement.\n"
+#~ "To attract any practitioners, the lure of black magic must be a great "
+#~ "prize indeed, for anyone caught practicing the art in the civilized world "
+#~ "is subject to a death sentence. And yet there are those who pursue this "
+#~ "art, for the prize offered is nothing less than immortality. Hidden away "
+#~ "in secret cults, or initiated into the dark orders of the underworld, the "
+#~ "training which these fanatics must endure often drives them to exhaustion "
+#~ "and enfeeblement.\n"
 #~ "\n"
 #~ "In such condition, their only weapon is the craft they have so committed "
 #~ "themselves to learning."
diff --git a/po/wesnoth-utbs/en_GB.po b/po/wesnoth-utbs/en_GB.po
index 9dc334377ac..e59a3509e8c 100644
--- a/po/wesnoth-utbs/en_GB.po
+++ b/po/wesnoth-utbs/en_GB.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: en_GB\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2009-05-03 11:08+0200\n"
-"PO-Revision-Date: 2007-01-04 19:49+0000\n"
-"Last-Translator: Peter J Ross <wesnoth@pjr.britishlibrary.net>\n"
+"PO-Revision-Date: 2009-05-10 16:05-0000\n"
+"Last-Translator: Gabríel A. Pétursson <gabrielp@simnet.is>\n"
 "Language-Team: English (British) <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. [campaign]: id=Under_the_Burning_Suns
@@ -1961,7 +1961,7 @@ msgstr "Ystara"
 #. [objective]: condition=lose
 #: data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg:176
 msgid "You lose control (even temporarily) of more than 6 villages."
-msgstr ""
+msgstr "You lose control (even temporarily) of more than 6 villages."
 
 #. [objective]: condition=win
 #: data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg:182
@@ -14938,8 +14938,7 @@ msgstr "Desert Star"
 #. [unit_type]: id=Desert Star, race=elf
 #: data/campaigns/Under_the_Burning_Suns/units/Desert_Star.cfg:46
 msgid "SPECIAL_NOTE^ It also gains a 10% bonus to resistance from all attacks."
-msgstr ""
-"SPECIAL_NOTE^ It also gains a 10% bonus to resistance from all attacks."
+msgstr " It also gains a 10% bonus to resistance from all attacks."
 
 #. [unit_type]: id=Desert Star, race=elf
 #: data/campaigns/Under_the_Burning_Suns/units/Desert_Star.cfg:46
@@ -15154,9 +15153,7 @@ msgstr "Ethereal Nightgaunt"
 msgid ""
 "SPECIAL_NOTE^ Unlike normal Nightgaunts, Ethereal Nightgaunts cannot hide at "
 "night."
-msgstr ""
-"SPECIAL_NOTE^ Unlike normal Nightgaunts, Ethereal Nightgaunts cannot hide at "
-"night."
+msgstr " Unlike normal Nightgaunts, Ethereal Nightgaunts cannot hide at night."
 
 #. [unit_type]: id=ENightgaunt
 #: data/campaigns/Under_the_Burning_Suns/units/Ethereal_Nightgaunt.cfg:14
@@ -15180,8 +15177,7 @@ msgstr "Ethereal Shadow"
 #: data/campaigns/Under_the_Burning_Suns/units/Ethereal_Shadow.cfg:17
 msgid ""
 "SPECIAL_NOTE^ Unlike normal Shadows, Ethereal Shadows cannot hide at night."
-msgstr ""
-"SPECIAL_NOTE^ Unlike normal Shadows, Ethereal Shadows cannot hide at night."
+msgstr " Unlike normal Shadows, Ethereal Shadows cannot hide at night."
 
 #. [unit_type]: id=EShadow
 #: data/campaigns/Under_the_Burning_Suns/units/Ethereal_Shadow.cfg:17
diff --git a/po/wesnoth/en_GB.po b/po/wesnoth/en_GB.po
index 3350ed0ddea..d0bf11b6ccf 100644
--- a/po/wesnoth/en_GB.po
+++ b/po/wesnoth/en_GB.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: en_GB\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2009-05-12 11:15+0200\n"
-"PO-Revision-Date: 2009-03-20 16:14-0500\n"
-"Last-Translator: Eric S. Raymond <esr@thyrsus.com>\n"
+"PO-Revision-Date: 2009-05-10 15:50-0000\n"
+"Last-Translator: Gabríel A. Pétursson <gabrielp@simnet.is>\n"
 "Language-Team: English (British) <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -382,9 +382,8 @@ msgstr "Hungarian Translation"
 
 #. [about]
 #: data/core/about.cfg:1689
-#, fuzzy
 msgid "Icelandic translation"
-msgstr "Italian Translation"
+msgstr "Icelandic Translation"
 
 #. [about]
 #: data/core/about.cfg:1699
@@ -1988,7 +1987,6 @@ msgstr ""
 
 #. [topic]: id=traits_healthy
 #: data/core/help.cfg:442
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -1999,7 +1997,8 @@ msgstr ""
 "\n"
 "\n"
 "Healthy units have 1 HP plus 1 HP per level more than usual and rest heal "
-"the usual 2 HP after each turn they did not fight."
+"the usual 2 HP after each turn they did not fight. They also suffer a "
+"quarter less damage from poison."
 
 #. [topic]: id=traits_dim
 #: data/core/help.cfg:447
@@ -2110,8 +2109,8 @@ msgid ""
 "text='Flat'</ref> terrain."
 msgstr ""
 "Roads are beaten paths of dirt, formed by many travellers passing over them. "
-"As far as gameplay is concerned, Roads are identical to "
-"<ref>dst=terrain_grassland text=Grassland</ref>."
+"As far as gameplay is concerned, Roads behave as <ref>dst='terrain_flat' "
+"text='Flat'</ref> terrain."
 
 #. [topic]: id=terrain_forest
 #: data/core/help.cfg:501
@@ -2561,13 +2560,13 @@ msgid ""
 "This provides an attack bonus for lawful units and removes the attack bonus "
 "from chaotic units."
 msgstr ""
-"The dangers inherent in trying to walk on lava are fairly obvious. This "
-"terrain can only be crossed by those units capable of flying a considerable "
-"distance above it. The molten magma also produces a substantial glow, "
-"illuminating the area immediately above it.  The molten magma also produces "
-"a substantial glow, illuminating the area immediately above it. This "
-"provides an attack bonus for lawful units and removes the attack bonus from "
-"chaotic units."
+"The dangers inherent in trying to walk on lava are fairly obvious.As far as "
+"movement is concerned, lava is equivalent to <ref>dst='terrain_unwalkable' "
+"text='Unwalkable'</ref> terrain, and can only be crossed by those units "
+"capable of flying a considerable distance above it. The molten magma also "
+"produces a substantial glow, illuminating the area immediately above it. "
+"This provides an attack bonus for lawful units and removes the attack bonus "
+"from chaotic units."
 
 #. [topic]: id=terrain_ford
 #: data/core/help.cfg:717
@@ -6178,7 +6177,7 @@ msgstr "DejaVuSans.ttf,wqy-zenhei.ttc"
 #. [fonts]
 #: data/hardwired/fonts.cfg:8
 msgid "DejaVu Sans,WenQuanYi Zen Hei"
-msgstr ""
+msgstr "DejaVu Sans,WenQuanYi Zen Hei"
 
 #. [tip]
 #: data/hardwired/tips.cfg:3
@@ -7065,24 +7064,24 @@ msgstr "Failed teleport! Exit not empty"
 msgid "Friendly unit sighted"
 msgid_plural "$friends friendly units sighted"
 msgstr[0] "Friendly unit sighted"
-msgstr[1] "Friendly unit sighted"
+msgstr[1] "$friends friendly units sighted"
 
 #: src/actions.cpp:2493
 msgid "Enemy unit sighted!"
 msgid_plural "$enemies enemy units sighted!"
 msgstr[0] "Enemy unit sighted!"
-msgstr[1] "Enemy unit sighted!"
+msgstr[1] "$enemies enemy units sighted!"
 
 #: src/actions.cpp:2498
 msgid "Part of 'Units sighted! (...)' sentence^1 friendly"
 msgid_plural "$friends friendly"
-msgstr[0] "a friendly"
+msgstr[0] "1 friendly"
 msgstr[1] "$friends friendly"
 
 #: src/actions.cpp:2499
 msgid "Part of 'Units sighted! (...)' sentence^1 enemy"
 msgid_plural "$enemies enemy"
-msgstr[0] "an enemy"
+msgstr[0] "1 enemy"
 msgstr[1] "$enemies enemy"
 
 #: src/actions.cpp:2500
@@ -7168,6 +7167,8 @@ msgid ""
 "Do you want to download this add-on? (You will still have to install the "
 "dependencies in order to play.)"
 msgstr ""
+"Do you want to download this add-on? (You will still have to install the "
+"dependencies in order to play.)"
 
 #: src/addon_management.cpp:469 src/addon_management.cpp:543
 #: src/multiplayer.cpp:207 src/multiplayer.cpp:262 src/multiplayer_ui.cpp:76
@@ -8141,7 +8142,7 @@ msgid ""
 "scenario settings^Start\n"
 "Gold"
 msgstr ""
-"scenario settings^Start\n"
+"Start\n"
 "Gold"
 
 #: src/menu_events.cpp:494
@@ -8149,7 +8150,7 @@ msgid ""
 "scenario settings^Base\n"
 "Income"
 msgstr ""
-"scenario settings^Base\n"
+"Base\n"
 "Income"
 
 #: src/menu_events.cpp:495
@@ -8157,7 +8158,7 @@ msgid ""
 "scenario settings^Gold Per\n"
 "Village"
 msgstr ""
-"scenario settings^Gold Per\n"
+"Gold Per\n"
 "Village"
 
 #: src/menu_events.cpp:496
@@ -8340,7 +8341,7 @@ msgstr "Kick a player or observer."
 
 #: src/menu_events.cpp:2050
 msgid "Mute an observer. Without an argument displays the mute status."
-msgstr ""
+msgstr "Mute an observer. Without an argument displays the mute status."
 
 #: src/menu_events.cpp:2052
 msgid "Mute all observers."
@@ -8348,7 +8349,7 @@ msgstr "Mute all observers."
 
 #: src/menu_events.cpp:2062
 msgid "Send a message to the server admins currently online"
-msgstr ""
+msgstr "Send a message to the server admins currently online"
 
 #: src/menu_events.cpp:2064
 msgid "Send an emotion or personal action in chat."
@@ -9813,8 +9814,20 @@ msgstr "Help us make Wesnoth better for you!"
 msgid "Enable summary uploads"
 msgstr "Enable summary uploads"
 
-#~ msgid "Do you still want to download it?"
-#~ msgstr "Do you really want to download it?"
+#~ msgid "stones"
+#~ msgstr "stones"
+
+#~ msgid "An invalid weapon is selected, possibly by the Python AI."
+#~ msgstr "An invalid weapon is selected, possibly by the Python AI."
+
+#~ msgid "female^stone"
+#~ msgstr "stone"
+
+#~ msgid "stone"
+#~ msgstr "stone"
+
+#~ msgid "Unknown unit type : "
+#~ msgstr "Unknown unit type : "
 
 #~ msgid "Quit Game"
 #~ msgstr "Quit Game"
@@ -9822,21 +9835,6 @@ msgstr "Enable summary uploads"
 #~ msgid "Ignore All"
 #~ msgstr "Ignore all"
 
-#~ msgid "Name: "
-#~ msgstr "Name: "
-
-#~ msgid "Save already exists. Do you want to overwrite it?"
-#~ msgstr "Save already exists. Do you want to overwrite it?"
-
-#~ msgid "Overwrite?"
-#~ msgstr "Overwrite?"
-
-#~ msgid "An invalid weapon is selected, possibly by the Python AI."
-#~ msgstr "An invalid weapon is selected, possibly by the Python AI."
-
-#~ msgid "Unknown unit type : "
-#~ msgstr "Unknown unit type : "
-
 #~ msgid ""
 #~ "Save names may not contain colons, slashes, or backslashes. Please choose "
 #~ "a different name."
@@ -9844,31 +9842,29 @@ msgstr "Enable summary uploads"
 #~ "Save names may not contain colons, slashes or backslashes. Please choose "
 #~ "a different name."
 
+#~ msgid "Save already exists. Do you want to overwrite it?"
+#~ msgstr "Save already exists. Do you want to overwrite it?"
+
+#~ msgid "Name: "
+#~ msgstr "Name: "
+
+#~ msgid "Overwrite?"
+#~ msgstr "Overwrite?"
+
+#~ msgid "stone: "
+#~ msgstr "stone: "
+
 #~ msgid "Remove a trait from a unit. (Does not work yet.)"
 #~ msgstr "Remove a trait from a unit. (Does not work yet.)"
 
+#~ msgid "The replay could not be saved"
+#~ msgstr "The replay could not be saved"
+
 #~ msgid "Name:"
 #~ msgstr "Name:"
 
-#, fuzzy
-#~ msgid "Landar"
-#~ msgstr "Leader"
-
-#, fuzzy
-#~ msgid "Thursagan"
-#~ msgstr "Turn"
-
-#~ msgid "stones"
-#~ msgstr "stones"
-
-#~ msgid "female^stone"
-#~ msgstr "stone"
-
-#~ msgid "stone"
-#~ msgstr "stone"
-
-#~ msgid "stone: "
-#~ msgstr "stone: "
+#~ msgid "Do you still want to download it?"
+#~ msgstr "Do you really want to download it?"
 
 #~ msgid " included from "
 #~ msgstr " included from "
@@ -9876,9 +9872,6 @@ msgstr "Enable summary uploads"
 #~ msgid "Mute an observer."
 #~ msgstr "Mute an observer."
 
-#~ msgid "The replay could not be saved"
-#~ msgstr "The replay could not be saved"
-
 #~ msgid "Unchecked script files found:"
 #~ msgstr "Unchecked script files found:"