[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./Makefile.in ./aclocal.m4 ./configure ...
|
From: |
David White |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth ./Makefile.in ./aclocal.m4 ./configure ... |
|
Date: |
Sat, 28 Aug 2004 00:56:40 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <address@hidden> 04/08/28 04:51:51
Modified files:
. : Makefile.in aclocal.m4 configure
icons : Makefile.in
m4 : Makefile.in
po : ca.po cs.po da.po de.po fi.po hu.po it.po nl.po
no.po pl.po pt_BR.po sk.po sv.po
src : Makefile.in multiplayer.cpp network.cpp
network.hpp unit_types.hpp
src/server : Makefile.in
src/tools : Makefile.in
src/zip : Makefile.in
Log message:
made hosting games work elegantly when wesnothd is running on the same
machine
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.in.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/aclocal.m4.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/icons/Makefile.in.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/m4/Makefile.in.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/ca.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/cs.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/da.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/de.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/fi.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/hu.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/it.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/nl.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/no.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/pl.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/pt_BR.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/sk.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/sv.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.in.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.117&tr2=1.118&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.hpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.in.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.in.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zip/Makefile.in.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: wesnoth/Makefile.in
diff -u wesnoth/Makefile.in:1.34 wesnoth/Makefile.in:1.35
--- wesnoth/Makefile.in:1.34 Fri Aug 27 16:24:42 2004
+++ wesnoth/Makefile.in Sat Aug 28 04:51:48 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -478,16 +478,14 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
- empty_fix=.; \
else \
include_option=--include; \
- empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
+ test -f $$subdir/TAGS && \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -497,11 +495,9 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -610,7 +606,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Index: wesnoth/aclocal.m4
diff -u wesnoth/aclocal.m4:1.17 wesnoth/aclocal.m4:1.18
--- wesnoth/aclocal.m4:1.17 Fri Aug 27 16:24:42 2004
+++ wesnoth/aclocal.m4 Sat Aug 28 04:51:48 2004
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
@@ -40,7 +40,7 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.8.5])])
+ [AM_AUTOMAKE_VERSION([1.8.3])])
# AM_AUX_DIR_EXPAND
@@ -266,14 +266,9 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
Index: wesnoth/configure
diff -u wesnoth/configure:1.90 wesnoth/configure:1.91
--- wesnoth/configure:1.90 Fri Aug 27 19:54:54 2004
+++ wesnoth/configure Sat Aug 28 04:51:48 2004
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.74 .
+# From configure.ac Revision: 1.75 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for Battle for Wesnoth 0.8.4-CVS.
#
@@ -998,7 +998,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -2756,7 +2756,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2814,7 +2815,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2930,7 +2932,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2984,7 +2987,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3029,7 +3033,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3073,7 +3078,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3183,14 +3189,9 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
@@ -3394,7 +3395,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3448,7 +3450,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3763,7 +3766,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3970,7 +3974,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4031,7 +4036,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4091,7 +4097,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4170,7 +4177,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4235,7 +4243,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4300,7 +4309,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4364,7 +4374,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4434,7 +4445,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4497,7 +4509,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4559,7 +4572,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4621,7 +4635,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4683,7 +4698,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4755,7 +4771,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4904,7 +4921,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4985,7 +5003,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5126,7 +5145,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5264,7 +5284,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5448,7 +5469,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5823,7 +5845,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5908,7 +5931,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5977,7 +6001,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6045,7 +6070,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6214,7 +6240,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6254,7 +6281,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6310,7 +6338,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6350,7 +6379,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6414,7 +6444,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6441,8 +6472,10 @@
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in
cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross
compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
@@ -6535,7 +6568,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6575,7 +6609,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6631,7 +6666,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6671,7 +6707,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6735,7 +6772,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6762,8 +6800,10 @@
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in
cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross
compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
@@ -6856,7 +6896,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6896,7 +6937,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6952,7 +6994,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6992,7 +7035,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7056,7 +7100,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7083,8 +7128,10 @@
esac
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in
cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross
compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
@@ -7177,7 +7224,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7253,7 +7301,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7952,7 +8001,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8030,7 +8080,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8239,7 +8290,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8306,7 +8358,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8374,7 +8427,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8443,7 +8497,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8511,7 +8566,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8579,7 +8635,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8703,7 +8760,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8753,7 +8811,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8843,7 +8902,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8908,7 +8968,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8972,7 +9033,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -9158,7 +9220,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -9603,7 +9666,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -9657,7 +9721,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10181,7 +10246,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10239,7 +10305,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10310,7 +10377,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10354,7 +10422,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10458,14 +10527,9 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
@@ -10863,7 +10927,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10921,7 +10986,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11037,7 +11103,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11091,7 +11158,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11136,7 +11204,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11180,7 +11249,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11290,14 +11360,9 @@
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ # (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored.
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
@@ -11331,12 +11396,9 @@
have_libx11='no'
if test "$with_x" != 'no'; then
-
-if test "x$ac_path_x_has_been_run" != xyes; then
- echo "$as_me:$LINENO: checking for X" >&5
+ echo "$as_me:$LINENO: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
-ac_path_x_has_been_run=yes
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -11429,7 +11491,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for a specified header file.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11503,7 +11565,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11563,15 +11626,10 @@
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- # It might be that x_includes is empty (headers are found in the
- # standard search path. Then output the corresponding message
- ac_out_x_includes=$x_includes
- test "x$x_includes" = x && ac_out_x_includes="in standard search path"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers
$ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes"
>&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
-fi
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -11619,7 +11677,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11670,7 +11729,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11746,7 +11806,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11801,7 +11862,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11869,7 +11931,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -11977,7 +12040,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12041,7 +12105,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12109,7 +12174,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12213,7 +12279,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12277,7 +12344,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12374,7 +12442,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12438,7 +12507,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12535,7 +12605,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12599,7 +12670,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12678,7 +12750,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -12751,7 +12824,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13312,7 +13386,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13389,7 +13464,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13466,7 +13542,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13543,7 +13620,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13635,7 +13713,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13707,7 +13786,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13761,7 +13841,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13832,7 +13913,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13886,7 +13968,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13953,7 +14036,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -14125,7 +14209,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -14273,7 +14358,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -14421,7 +14507,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -14569,7 +14656,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -14717,7 +14805,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -14875,7 +14964,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15057,7 +15147,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15112,7 +15203,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15227,7 +15319,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15287,7 +15380,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15360,7 +15454,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15425,7 +15520,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15489,7 +15585,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15551,7 +15648,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15801,7 +15899,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15870,7 +15969,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -15977,7 +16077,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -17275,6 +17376,11 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -17313,12 +17419,6 @@
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Index: wesnoth/icons/Makefile.in
diff -u wesnoth/icons/Makefile.in:1.26 wesnoth/icons/Makefile.in:1.27
--- wesnoth/icons/Makefile.in:1.26 Fri Aug 27 16:24:43 2004
+++ wesnoth/icons/Makefile.in Sat Aug 28 04:51:48 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: wesnoth/m4/Makefile.in
diff -u wesnoth/m4/Makefile.in:1.6 wesnoth/m4/Makefile.in:1.7
--- wesnoth/m4/Makefile.in:1.6 Fri Aug 27 16:24:43 2004
+++ wesnoth/m4/Makefile.in Sat Aug 28 04:51:48 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: wesnoth/po/ca.po
diff -u wesnoth/po/ca.po:1.7 wesnoth/po/ca.po:1.8
--- wesnoth/po/ca.po:1.7 Thu Aug 26 08:24:25 2004
+++ wesnoth/po/ca.po Sat Aug 28 04:51:48 2004
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-26 10:13+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-26 10:12+0200\n"
"Last-Translator: Jordà Polo <address@hidden>\n"
"Language-Team: Català \n"
@@ -187,7 +187,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
#, fuzzy
msgid "Movement"
msgstr "Moviments"
@@ -678,7 +678,8 @@
msgstr "&human-general.png,Lleials"
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+#, fuzzy
+msgid "&elvish-high-lord.png,Rebels"
msgstr "&elvish-lord.png,Rebels"
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -706,7 +707,8 @@
msgstr "&human-general.png,Humans"
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+#, fuzzy
+msgid "&elvish-high-lord.png,Elves"
msgstr "&elvish-lord.png,Elfs"
#: data/multiplayer.cfg:125
@@ -726,7 +728,8 @@
msgstr "La Gran Guerra"
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+#, fuzzy
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr "&elvish-lord.png,Aliança de la Llum"
#: data/multiplayer.cfg:265
@@ -1630,34 +1633,53 @@
"#Mort de Kalenz\n"
"#Fi dels torns"
-#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:64
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
msgid "What the... swamps? These were fertile plains when I was here last!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:68
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
"The lich-lord must have flooded the valley. The undead like the swamp. It is "
"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:72
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:76
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:88
-#: data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:200
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
#, fuzzy
-msgid "What is that?"
+msgid "What is that?!?"
msgstr "Què és allò?!"
-#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:92
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
msgid "I leave you to your doom."
msgstr ""
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
+msgstr ""
+
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
msgid "The Duel"
msgstr ""
@@ -3916,6 +3938,11 @@
msgid "Ruaarrrrrrrr!"
msgstr "Ruaarrrrrrrr!"
+#: data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:200
+#, fuzzy
+msgid "What is that?"
+msgstr "Què és allò?!"
+
#: data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:205
#, fuzzy
msgid ""
@@ -7623,7 +7650,7 @@
msgid "Toward Mountains of Haag"
msgstr "Cap a les Muntanyes de Haag"
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
#, fuzzy
msgid ""
"\n"
@@ -7631,6 +7658,7 @@
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
"\n"
@@ -7640,117 +7668,117 @@
"#Mort de Kapou'e\n"
"#Fi dels torns"
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -12087,7 +12115,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -12095,7 +12123,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -12103,7 +12131,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -12111,7 +12139,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -12120,7 +12148,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -12128,17 +12156,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -12828,7 +12856,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -13457,16 +13485,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -13547,10 +13576,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -13560,11 +13589,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -13625,19 +13655,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -13732,12 +13762,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -13821,7 +13851,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -14093,7 +14123,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -14617,6 +14647,20 @@
"principalment entrenat per la lluita cos a cos amb espasa, però tammateix
és "
"hà bil amb l'arc."
+#: data/units/Elvish_High_Lord.cfg:3
+#, fuzzy
+msgid "Elvish High Lord"
+msgstr "Senyor Elf"
+
+#: data/units/Elvish_High_Lord.cfg:17
+#, fuzzy
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+"El Senyo Elf és un combatent ferotge, hà bil amb l'espasa i temible per les "
+"boles de foc que és capaç de llançar."
+
#: data/units/Elvish_Lord.cfg:3
#, fuzzy
msgid "Elvish Lord"
@@ -15089,11 +15133,11 @@
"Són el resultat de promocionar els millors d'entre tots els soldats. La seva
"
"arma és lenta d'utilitzar, però són capaços de produir ferides letals."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -16350,7 +16394,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:469
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -16551,12 +16595,12 @@
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:561
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:615
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
@@ -16567,17 +16611,17 @@
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:616
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:693
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:693
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -16685,83 +16729,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1875
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1874
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -17001,7 +17045,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -17117,35 +17161,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -17157,8 +17197,8 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:377
-#: src/multiplayer_connect.cpp:379 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -17229,8 +17269,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:466
-#: src/multiplayer_connect.cpp:580 src/multiplayer_connect.cpp:674
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -17238,64 +17278,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:367
-#: src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:356
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:359 src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:362 src/multiplayer_connect.cpp:365
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:372 src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:529 src/multiplayer_connect.cpp:533
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
Index: wesnoth/po/cs.po
diff -u wesnoth/po/cs.po:1.4 wesnoth/po/cs.po:1.5
--- wesnoth/po/cs.po:1.4 Tue Aug 24 21:43:16 2004
+++ wesnoth/po/cs.po Sat Aug 28 04:51:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -177,7 +177,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -663,7 +663,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -691,7 +691,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -711,7 +711,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1547,94 +1547,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6647,127 +6661,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7145,6 +7160,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7346,7 +7362,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7356,74 +7376,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11046,7 +11058,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11054,7 +11066,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11062,7 +11074,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11070,7 +11082,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11079,7 +11091,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11087,17 +11099,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11250,7 +11262,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11422,7 +11434,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11764,7 +11776,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12371,16 +12383,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12456,10 +12469,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12469,11 +12482,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12529,19 +12543,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12635,12 +12649,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12715,7 +12729,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12960,7 +12974,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13404,6 +13418,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13789,11 +13813,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14833,7 +14857,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14927,141 +14951,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15077,11 +15101,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15168,83 +15192,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15256,7 +15280,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15292,7 +15316,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15336,7 +15360,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15344,11 +15368,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15452,7 +15476,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15476,7 +15500,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15484,7 +15508,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15504,7 +15528,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15512,23 +15536,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15600,35 +15624,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15640,9 +15660,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15687,11 +15707,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15712,8 +15732,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15721,64 +15741,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15861,208 +15881,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16077,177 +16113,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16307,7 +16343,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/da.po
diff -u wesnoth/po/da.po:1.4 wesnoth/po/da.po:1.5
--- wesnoth/po/da.po:1.4 Tue Aug 24 21:43:16 2004
+++ wesnoth/po/da.po Sat Aug 28 04:51:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/de.po
diff -u wesnoth/po/de.po:1.4 wesnoth/po/de.po:1.5
--- wesnoth/po/de.po:1.4 Tue Aug 24 21:43:16 2004
+++ wesnoth/po/de.po Sat Aug 28 04:51:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/fi.po
diff -u wesnoth/po/fi.po:1.4 wesnoth/po/fi.po:1.5
--- wesnoth/po/fi.po:1.4 Tue Aug 24 21:43:17 2004
+++ wesnoth/po/fi.po Sat Aug 28 04:51:49 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/hu.po
diff -u wesnoth/po/hu.po:1.4 wesnoth/po/hu.po:1.5
--- wesnoth/po/hu.po:1.4 Tue Aug 24 21:43:17 2004
+++ wesnoth/po/hu.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/it.po
diff -u wesnoth/po/it.po:1.4 wesnoth/po/it.po:1.5
--- wesnoth/po/it.po:1.4 Tue Aug 24 21:43:18 2004
+++ wesnoth/po/it.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/nl.po
diff -u wesnoth/po/nl.po:1.4 wesnoth/po/nl.po:1.5
--- wesnoth/po/nl.po:1.4 Tue Aug 24 21:43:18 2004
+++ wesnoth/po/nl.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/no.po
diff -u wesnoth/po/no.po:1.4 wesnoth/po/no.po:1.5
--- wesnoth/po/no.po:1.4 Tue Aug 24 21:43:18 2004
+++ wesnoth/po/no.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-24 07:17+0100\n"
"Last-Translator: Erik <address@hidden>\n"
"Language-Team: none\n"
@@ -179,7 +179,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr "Forflytning"
@@ -690,7 +690,8 @@
msgstr "&human-general.png,Lojalister"
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+#, fuzzy
+msgid "&elvish-high-lord.png,Rebels"
msgstr "&elvish-lord.png,Opprørere"
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -718,7 +719,8 @@
msgstr "&human-general.png,Mennesker"
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+#, fuzzy
+msgid "&elvish-high-lord.png,Elves"
msgstr "&elvish-lord.png,Alver"
#: data/multiplayer.cfg:125
@@ -738,7 +740,8 @@
msgstr "Den store krigen"
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+#, fuzzy
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr "&elvish-lord.png,Lysets Allianse"
#: data/multiplayer.cfg:265
@@ -1593,54 +1596,6 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
-msgid ""
-"\n"
-"Victory:\n"
-"@Defeat enemy leader\n"
-"Defeat:\n"
-"#Death of Gweddry\n"
-"#Death of Dacyn\n"
-"#Death of Owaec\n"
-"#Death of Sudoc"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
-msgstr ""
-
#: data/scenarios/Eastern_Invasion/Reject.cfg:3
msgid "Weldyn Besieged"
msgstr ""
@@ -1683,6 +1638,78 @@
msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+#, fuzzy
+msgid "The Drowned Plains"
+msgstr "Snøkledde Vidder"
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
+#, fuzzy
+msgid ""
+"\n"
+"Victory:\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
+"Defeat:\n"
+"#Death of Gweddry\n"
+"#Death of Dacyn\n"
+"#Death of Owaec\n"
+"#Turns run out"
+msgstr ""
+"\n"
+"Seier:\n"
+"@Overvinn fiendens leder\n"
+"Tap:\n"
+"#Gweddry dør\n"
+"#Dacyn dør\n"
+"#Volas dør"
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
+msgid ""
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+#, fuzzy
+msgid "What is that?!?"
+msgstr "Hva er det?"
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
+msgstr ""
+
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
msgid "The Duel"
msgstr ""
@@ -7743,127 +7770,136 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
+#, fuzzy
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
+"\n"
+"Seier:\n"
+"@Flytt Konrad til skiltet i nordvest\n"
+"Nederlag:\n"
+"#Konrad dør\n"
+"#Delfador dør\n"
+"#Tiden renner ut"
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -8249,6 +8285,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -8460,7 +8497,11 @@
msgid "The Skull of Agarash"
msgstr "Agarashs Hodeskalle"
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
#, fuzzy
msgid ""
"\n"
@@ -8477,75 +8518,67 @@
"#Gwiti Ha'atel dør\n"
"#Tiden renner ut"
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
-msgstr ""
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+#, fuzzy
+msgid "Speak on."
+msgstr "Snakk med alle"
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-#, fuzzy
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr "I am dying, and my army is defeated! This is the end...!"
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -12222,7 +12255,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -12230,7 +12263,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -12238,7 +12271,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -12246,7 +12279,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -12255,7 +12288,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -12263,17 +12296,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -12427,7 +12460,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
#, fuzzy
msgid "No"
msgstr "Nei"
@@ -12606,7 +12639,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr "Ja"
@@ -13024,7 +13057,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr "eller"
@@ -13670,16 +13703,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
#, fuzzy
msgid "magical"
msgstr "magisk"
@@ -13763,10 +13797,10 @@
msgstr "stav"
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
#, fuzzy
msgid "fireball"
msgstr "ildkule"
@@ -13777,11 +13811,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -13844,19 +13879,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -13955,12 +13990,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -14050,7 +14085,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -14331,7 +14366,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -14846,6 +14881,20 @@
"slagmarken, med sine ekstreme kampferdigher, finpusset til perfeksjon. Den "
"Alviske Helten foretrekker nærkamp med sverd, men er også dyktig med buen."
+#: data/units/Elvish_High_Lord.cfg:3
+#, fuzzy
+msgid "Elvish High Lord"
+msgstr "Alvisk Herre"
+
+#: data/units/Elvish_High_Lord.cfg:17
+#, fuzzy
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+"Den Alviske Herren er fryktelig i kamp, med både sverd i nærkamp og
ildkuler "
+"over distanse på sitt repetoire."
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr "Alvisk Herre"
@@ -15331,11 +15380,11 @@
"litt langsommere enn sverdkjemperne, gjør deres evner med hellebarden dem "
"til en minst like dødelig motstander."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -16599,7 +16648,7 @@
"I dag nesten en guttunge, men ved sin hengivenhet til kronen søker han å
bli "
"en Herre -- å sitge inn i rekkene av elitekrigere."
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr "Lukk"
@@ -16700,60 +16749,60 @@
msgid "No objectives available"
msgstr "Ingen mål tilgjengelig."
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr "Lagret spill eksisterer allerede. Vil du overskrive det?"
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr "%a %b %d %H:%M %Y"
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr "Flerspiller"
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr "Opplæring"
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr "avspilling"
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr "Runde"
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
#, fuzzy
msgid "No Saved Games"
msgstr "Ingen Lagrede Spill"
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
#, fuzzy
msgid ""
"There are no saved games to load.\n"
@@ -16762,90 +16811,90 @@
"Det finnes ingen lagrede spill å laste inn.\n"
"(Spillet blir lagret automatisk når du gjør ferdig et scenario)"
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
#, fuzzy
msgid "Show replay"
msgstr "Vis reprise"
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr "Last inn spill"
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
#, fuzzy
msgid "Choose the game to load"
msgstr "Velg spill for innlasting"
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr "OK"
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr "Avbryt"
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
#, fuzzy
msgid "level"
msgstr "nivå"
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
#, fuzzy
msgid "HP"
msgstr "LP"
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
#, fuzzy
msgid "XP"
msgstr "EP"
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
#, fuzzy
msgid "Moves"
msgstr "Flytt"
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
#, fuzzy
msgid "melee"
msgstr "nærkamp"
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
#, fuzzy
msgid "ranged"
msgstr "avstand"
@@ -16864,11 +16913,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Vil du lagre hendelsene som skjedde i dette scenariet?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr "Navn:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -16962,90 +17011,90 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
#, fuzzy
msgid "Name"
msgstr "Navn"
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
#, fuzzy
msgid "Type"
msgstr "Type"
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr "Motstand"
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
#, fuzzy
msgid "Attack Type"
msgstr "Angrepstype"
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
#, fuzzy
msgid "Resistance"
msgstr "Resistanse"
-#: src/help.cpp:757
+#: src/help.cpp:758
#, fuzzy
msgid "Terrain Modifiers"
msgstr "Terrengmodifikasjoner"
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
#, fuzzy
msgid "Terrain"
msgstr "Terreng"
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
#, fuzzy
msgid "Defense"
msgstr "Forsvar"
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -17057,7 +17106,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr "Leder"
@@ -17093,7 +17142,7 @@
msgid "Unit Description"
msgstr "Enhetsbeskrivelse"
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
#, fuzzy
msgid "Rename Unit"
msgstr "Gi enheten nytt navn"
@@ -17143,7 +17192,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
#, fuzzy
msgid "Preferences"
msgstr "Preferanser"
@@ -17153,12 +17202,12 @@
msgid "Scenario Objectives"
msgstr "Scenariets mål"
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
#, fuzzy
msgid "Unit List"
msgstr "Liste over enheter"
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -17263,7 +17312,7 @@
msgid "Speak to All"
msgstr "Snakk med alle"
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr "Hjelp"
@@ -17288,7 +17337,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
#, fuzzy
msgid "Close Window"
msgstr "Lukk vindu"
@@ -17298,7 +17347,7 @@
msgid "Map Generator"
msgstr "Kartgenerator"
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
#, fuzzy
msgid "Players"
msgstr "Spillere"
@@ -17323,7 +17372,7 @@
msgid "Bump Size"
msgstr "Humpstørrelse"
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
#, fuzzy
msgid "Villages"
msgstr "Landsbyer"
@@ -17332,23 +17381,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -17426,35 +17475,32 @@
msgid "Name of game"
msgstr "Spillets navn"
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
-msgstr ""
+#: src/multiplayer.cpp:178
+#, fuzzy
+msgid "$login's game"
+msgstr "s spill"
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr "Kart å spille"
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr "Ãra"
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr "Runder"
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr "Gull fra landsbyer"
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -17466,9 +17512,9 @@
msgid "Receiving game list..."
msgstr "Mottar spilliste..."
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
#, fuzzy
msgid "Gold"
msgstr "Gullstykker"
@@ -17517,14 +17563,14 @@
#: src/multiplayer_connect.cpp:48
#, fuzzy
-msgid "I'm Ready"
-msgstr "Jeg er klar"
-
-#: src/multiplayer_connect.cpp:50
-#, fuzzy
msgid " Computer vs Computer "
msgstr " La datamaskinen spille mot seg selv "
+#: src/multiplayer_connect.cpp:49
+#, fuzzy
+msgid "I'm Ready"
+msgstr "Jeg er klar"
+
#: src/multiplayer_connect.cpp:97
#, fuzzy
msgid "This is not a multiplayer save"
@@ -17545,8 +17591,8 @@
msgid "Local Player"
msgstr "Menneske"
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr "Datastyrt spiller"
@@ -17554,74 +17600,74 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
#, fuzzy
msgid "Team"
msgstr "Lag"
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
#, fuzzy
msgid "Red"
msgstr "Rød"
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
#, fuzzy
msgid "Blue"
msgstr "Blå"
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
#, fuzzy
msgid "Green"
msgstr "Grønn"
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
#, fuzzy
msgid "Yellow"
msgstr "Gul"
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
#, fuzzy
msgid "Purple"
msgstr "Lilla"
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr "Oransje"
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr "Grå"
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr "Hvit"
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr "Brun"
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
#, fuzzy
msgid "Game Lobby"
msgstr "Vestibyle"
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
#, fuzzy
msgid "Player/Type"
msgstr "Spiller/Type"
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
#, fuzzy
msgid "Race"
msgstr "Rase"
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
#, fuzzy
msgid "Color"
msgstr "Farge"
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -17717,117 +17763,117 @@
"Det har skjedd en frakobling fra nettverket, og spillet kan ikke fortsette. "
"Vil du lagre spillet?"
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr "Det er nå din tur"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr "Nærkamp"
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
#, fuzzy
msgid "vs"
msgstr "mot"
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
#, fuzzy
msgid "Choose weapon"
msgstr "Velg våpen"
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
#, fuzzy
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr "Noen enheter kan fremdeles flytte. Vil du likevel avslutte runden din?"
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr "Lagre automatisk"
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr "Spillet har nå blitt lagret"
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
#, fuzzy
msgid "Units"
msgstr "Enheter"
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
#, fuzzy
msgid "Income"
msgstr "Inntekt"
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
#, fuzzy
msgid "Upkeep"
msgstr "Underhold"
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr "Det finnes ingen enheter du kan rekruttere."
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
#, fuzzy
msgid "Recruit unit"
msgstr "Rekrutter enhet"
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
#, fuzzy
msgid "You don't have enough gold to recruit that unit"
msgstr "Du har ikke nok gullstykker til å rekruttere denne enheten."
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
#, fuzzy
msgid "You are seperated from your soldiers and may not recall them"
msgstr "Du er blitt skilt fra soldatene dine og kan ikke kalle dem tilbake"
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
#, fuzzy
msgid ""
"There are no troops available to recall\n"
@@ -17836,84 +17882,100 @@
"Det finnes ingen tropper å tilbakekalle\n"
"(Du må ha veterantropper som har overlevd tidligere scenarier)."
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
#, fuzzy
msgid "You must have at least"
msgstr "Du må ha minst"
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
#, fuzzy
msgid "gold pieces to recall a unit"
msgstr "gullstykker for å tilbakekalle en enhet."
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
#, fuzzy
msgid "Select unit"
msgstr "Velg enhet"
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
#, fuzzy
msgid "Message"
msgstr "Beskjed"
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
#, fuzzy
msgid "Location"
msgstr "Sted"
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
#, fuzzy
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
@@ -17922,27 +17984,27 @@
"Spillene er ikke synkroniserte og må derfor avsluttes. Vil du lagre en "
"feillogg?"
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
#, fuzzy
msgid "Replace with AI"
msgstr "Erstatt med datastyrt spiller"
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
#, fuzzy
msgid "Replace with local player"
msgstr "Erstatt med lokal spiller"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
#, fuzzy
msgid "Abort game"
msgstr "Avbryt spill"
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
#, fuzzy
msgid "Replace with "
msgstr "Erstatt med datastyrt spiller"
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
#, fuzzy
msgid "has left the game. What do you want to do?"
msgstr "har forlatt spillet. Hva vil du gjøre?"
@@ -17962,191 +18024,191 @@
msgid "player"
msgstr "spiller"
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
#, fuzzy
msgid "Full Screen"
msgstr "Fullskjerm"
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
#, fuzzy
msgid "Accelerated Speed"
msgstr "Akselerert"
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
#, fuzzy
msgid "Show Grid"
msgstr "Vis rutenett"
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr "Dialogboks på ny runde"
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr "Pling på ny runde"
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr "Vis lagenes farger"
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
#, fuzzy
msgid "Video Mode"
msgstr "Video-modus"
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
#, fuzzy
msgid "Hotkeys"
msgstr "Hurtigtaster"
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
#, fuzzy
msgid "Music Volume:"
msgstr "Musikkvolum:"
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
#, fuzzy
msgid "SFX Volume:"
msgstr "Lydeffektvolum:"
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
#, fuzzy
msgid "Scroll Speed:"
msgstr "Panoreringsfart:"
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
#, fuzzy
msgid "There are no alternative video modes available"
msgstr "Det finnes ingen alternative video-moduser tilgjengelig"
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
#, fuzzy
msgid "Choose Resolution"
msgstr "Velg oppløsning"
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
#, fuzzy
msgid "Hotkey Settings"
msgstr "Innstillinger for Hurtigtaster"
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
#, fuzzy
msgid "Press desired HotKey"
msgstr "Trykk ønsket hurtigtast"
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
#, fuzzy
msgid "Change Hotkey"
msgstr "Endre hurtigtast"
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
#, fuzzy
msgid "Save Hotkeys"
msgstr "Lagre hurtigtaster"
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
#, fuzzy
msgid "This HotKey is already in use."
msgstr "Denne hurtigtasten er allerede i bruk. Ingen endringer ble gjort."
@@ -18217,7 +18279,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
#, fuzzy
msgid "KB"
msgstr "KB"
@@ -18325,8 +18387,9 @@
msgid "Deletion of the file failed."
msgstr ""
-#~ msgid "'s game"
-#~ msgstr "s spill"
+#, fuzzy
+#~ msgid "I am dying, and my army is defeated! This is the end..."
+#~ msgstr "I am dying, and my army is defeated! This is the end...!"
#~ msgid "About"
#~ msgstr "Om"
Index: wesnoth/po/pl.po
diff -u wesnoth/po/pl.po:1.4 wesnoth/po/pl.po:1.5
--- wesnoth/po/pl.po:1.4 Tue Aug 24 21:43:18 2004
+++ wesnoth/po/pl.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -177,7 +177,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -663,7 +663,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -691,7 +691,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -711,7 +711,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1547,94 +1547,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6647,127 +6661,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7145,6 +7160,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7346,7 +7362,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7356,74 +7376,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11046,7 +11058,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11054,7 +11066,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11062,7 +11074,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11070,7 +11082,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11079,7 +11091,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11087,17 +11099,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11250,7 +11262,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11422,7 +11434,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11764,7 +11776,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12371,16 +12383,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12456,10 +12469,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12469,11 +12482,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12529,19 +12543,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12635,12 +12649,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12715,7 +12729,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12960,7 +12974,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13404,6 +13418,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13789,11 +13813,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14833,7 +14857,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14927,141 +14951,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15077,11 +15101,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15168,83 +15192,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15256,7 +15280,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15292,7 +15316,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15336,7 +15360,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15344,11 +15368,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15452,7 +15476,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15476,7 +15500,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15484,7 +15508,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15504,7 +15528,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15512,23 +15536,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15600,35 +15624,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15640,9 +15660,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15687,11 +15707,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15712,8 +15732,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15721,64 +15741,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15861,208 +15881,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16077,177 +16113,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16307,7 +16343,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/pt_BR.po
diff -u wesnoth/po/pt_BR.po:1.4 wesnoth/po/pt_BR.po:1.5
--- wesnoth/po/pt_BR.po:1.4 Tue Aug 24 21:43:18 2004
+++ wesnoth/po/pt_BR.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/sk.po
diff -u wesnoth/po/sk.po:1.4 wesnoth/po/sk.po:1.5
--- wesnoth/po/sk.po:1.4 Tue Aug 24 21:43:18 2004
+++ wesnoth/po/sk.po Sat Aug 28 04:51:50 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/po/sv.po
diff -u wesnoth/po/sv.po:1.4 wesnoth/po/sv.po:1.5
--- wesnoth/po/sv.po:1.4 Tue Aug 24 21:43:19 2004
+++ wesnoth/po/sv.po Sat Aug 28 04:51:51 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -176,7 +176,7 @@
"Upkeep'</ref> for more information."
msgstr ""
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
msgid "Movement"
msgstr ""
@@ -662,7 +662,7 @@
msgstr ""
#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
msgstr ""
#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -690,7 +690,7 @@
msgstr ""
#: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
msgstr ""
#: data/multiplayer.cfg:125
@@ -710,7 +710,7 @@
msgstr ""
#: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
msgstr ""
#: data/multiplayer.cfg:265
@@ -1546,94 +1546,108 @@
"them."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:3
+msgid "Weldyn Besieged"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
+#: data/scenarios/Eastern_Invasion/Reject.cfg:25
msgid ""
"\n"
"Victory:\n"
-"@Defeat enemy leader\n"
+"@Defeat Mal-Ravanal\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc"
+"#Death of Sudoc\n"
+"#Letting any enemy unit onto your keep"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+msgid ""
+"You people are fools! You decided to reject my master's duel... very well, "
+"you will all DIE! And know, my master is here, watching your very demise. "
+"For he does not fear you at all, and knows that you will never be able to "
+"find him and kill him! There are seven of us, and only ONE of us is the real "
+"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:130
+msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:142
+msgid "How did you know...?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
+#: data/scenarios/Eastern_Invasion/Reject.cfg:161
+msgid "Kill the king!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
+#: data/scenarios/Eastern_Invasion/Reject.cfg:166
+msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:3
-msgid "Weldyn Besieged"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Reject.cfg:25
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
msgid ""
"\n"
"Victory:\n"
-"@Defeat Mal-Ravanal\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
"Defeat:\n"
"#Death of Gweddry\n"
"#Death of Dacyn\n"
"#Death of Owaec\n"
-"#Death of Sudoc\n"
-"#Letting any enemy unit onto your keep"
+"#Turns run out"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:125
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
msgid ""
-"You people are fools! You decided to reject my master's duel... very well, "
-"you will all DIE! And know, my master is here, watching your very demise. "
-"For he does not fear you at all, and knows that you will never be able to "
-"find him and kill him! There are seven of us, and only ONE of us is the real "
-"leader! ha ha ha ha! To be fair about it, we will all tell you our names."
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:130
-msgid "Remember, we have to kill Mal-Ravanal. He's here somewhere..."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:142
-msgid "How did you know...?"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:161
-msgid "Kill the king!"
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
msgstr ""
-#: data/scenarios/Eastern_Invasion/Reject.cfg:166
-msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
msgstr ""
#: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
@@ -6646,127 +6660,128 @@
msgid "Toward Mountains of Haag"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
msgid ""
"\n"
"Victory:\n"
"@Move Kapou'e to the end of the mountains\n"
"Defeat:\n"
"#Death of Kapou'e\n"
+"#Death of Grüü\n"
"#Turns run out"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
msgid ""
"We have nearly crossed the mountains. I feel the lands of the free tribes "
"are near now. But beware, there are dwarves and wild trolls around. Hurry "
"up! I can see the sign post that indicates their land."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
msgid "What are these orcs doing here? They should be too tired to live."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
msgid ""
"I've never pushed so far, we are crossing the border of the Black Eye lands."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
msgid "Look! Dwarves are fighting against orcs!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
msgid "Father, we should help them. Orcs are our allies."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
msgid ""
"I don't know if we should do that. Orcs have been our allies in the past, "
"but they have always treated us as fools."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
msgid ""
"But Father, we don't know what they are seeking there, maybe this is a good "
"occasion to get rid of these dwarves."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
msgid ""
"You are right, my son. We will help our orcish friends. But take care of "
"you ... I would be desperate if something would happen to you."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
msgid "Argh! I'm done. My people is dommed!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
msgid "Father! Oh no!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
msgid "Filthy dwarves! Now I'm to kill you to the last!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
#: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
msgid "Oh no, I'm defeated."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
msgid ""
"My son! I should have never brought him to this fight. Now we are to "
"return to our caverns, and we will never go back."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
msgid "Our troll friends are over. Without them there is no hope."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
msgid "Argh! I die!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
msgid ""
"We've succeeded! We've passed through the Mountains of Haag! Look at these "
"green hills! The land of the free tribes is near now. I can see the walls "
"of Barag-Gor in the distance."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
msgid ""
"Blemaker, many thanks for your help in this fight. Would you like to join "
"us in our journey with your son? Your help would be very appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
msgid "Father, I'd like to join them. Would you mind it?"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
msgid ""
"My son, you're old enough to discover the world. Me, I have to stay here. "
"But take care, there are plenty of creatures that seek our end, like elves "
"or humans. They are as clever as merciless."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
msgid "Thanks, father. Don't worry, I'll take care of myself."
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
msgid ""
"Grüü, many thanks for your help in this fight. I'm sorry for your father.
"
"Would you like to join us in our journey? Your help would be very "
"appreciated!"
msgstr ""
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
msgid ""
"My father would have come to help you. I would insult his memory not to "
"help you. I come!"
@@ -7144,6 +7159,7 @@
msgstr ""
#: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
msgid "What? I can't die! Noooo!"
msgstr ""
@@ -7345,7 +7361,11 @@
msgid "The Skull of Agarash"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
msgid ""
"\n"
"Victory:\n"
@@ -7355,74 +7375,66 @@
"#Turns run out"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
msgid ""
"After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
"his revenge. But a Dark Spirit came to counsel him..."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
msgid "Gwitiii...Gwiti!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
msgid ""
"Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
"south, against the orcs, and there find the Skull of Agarash."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
msgid ""
"Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
msgid "Oh, no! The undead hordes have taken my banner!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
msgid ""
"It is not your banner, and it never was! That skull has marked it as mine "
"since long ago."
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
msgid ""
"Argh! This is only half of the skull, and near enough to powerless! Begone, "
"Spirit!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
msgid "Let us trample his banner into the ground! *smash*"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
msgid "That skull is powerless!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
msgid "That is not the skull of Agarash!"
msgstr ""
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
msgid "It's been a long time since I fought anything myself!"
msgstr ""
@@ -11045,7 +11057,7 @@
"legions of the walking dead. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
msgid ""
"After a time of great struggle a peace was reached. We came to dominate most "
"of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11053,7 +11065,7 @@
"we gleaned our first shards of knowledge about magic."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
msgid ""
"Thus history continued apace for several centuries. You must recall that the "
"route from the Western lands to our Isle was perilous at the best of times. "
@@ -11061,7 +11073,7 @@
"Isle could never be maintained."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
msgid ""
"Things only got worse when looking to the East. A strong, cold, ocean "
"current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11069,7 +11081,7 @@
"nothing but open ocean, and vile sea monsters. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
msgid ""
"Over time our skills as navigators grew. Then, one day, the Crown Prince of "
"Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11078,7 +11090,7 @@
"Southern pull of the ocean."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
msgid ""
"It wasn't long after he returned that the very Crown Prince who discovered "
"the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11086,17 +11098,17 @@
"of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
msgid ""
"The new Crown Prince departed, with the largest army ever assembled on the "
"Isle to make war with the Wesfolk. This where our story begins. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
msgid "With the plight of a different Prince on the same Isle. . ."
msgstr ""
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
msgid ""
"For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
msgstr ""
@@ -11249,7 +11261,7 @@
#: data/scenarios/multiplayer/Wesbowl.cfg:361
#: data/scenarios/multiplayer/Wesbowl.cfg:638
#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
msgid "No"
msgstr ""
@@ -11421,7 +11433,7 @@
msgstr ""
#: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
msgid "Yes"
msgstr ""
@@ -11763,7 +11775,7 @@
"with this terrain"
msgstr ""
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
msgid "or"
msgstr ""
@@ -12370,16 +12382,17 @@
#: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
#: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
#: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
msgid "magical"
msgstr ""
@@ -12455,10 +12468,10 @@
msgstr ""
#: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
msgid "fireball"
msgstr ""
@@ -12468,11 +12481,12 @@
#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
#: data/units/Silver_Mage.cfg:129
msgid "fire"
@@ -12528,19 +12542,19 @@
#: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
#: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
#: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
#: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
#: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
#: data/units/General.cfg:22 data/units/Ghoul.cfg:20
#: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
#: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
#: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
#: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12634,12 +12648,12 @@
#: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
#: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
#: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
#: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12714,7 +12728,7 @@
#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
#: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
#: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12959,7 +12973,7 @@
msgid "battle axe"
msgstr ""
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
#: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
#: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13403,6 +13417,16 @@
"fighting at close range with the sword, but are also skilled at the bow."
msgstr ""
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
#: data/units/Elvish_Lord.cfg:3
msgid "Elvish Lord"
msgstr ""
@@ -13788,11 +13812,11 @@
"when defending."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
msgid "halberd"
msgstr ""
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
msgid "firststrike"
msgstr ""
@@ -14832,7 +14856,7 @@
"Lord -- to join the elite of human fighters."
msgstr ""
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
msgid "Close"
msgstr ""
@@ -14926,141 +14950,141 @@
msgid "No objectives available"
msgstr ""
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
msgid "Save already exists. Do you want to overwrite it ?"
msgstr ""
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
msgid "Don't ask me again!"
msgstr ""
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
msgid "Do you really want to delete this game?"
msgstr ""
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
msgid "%a %b %d %H:%M %Y"
msgstr ""
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
msgid "#(Invalid)"
msgstr ""
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
msgid "Multiplayer"
msgstr ""
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
msgid "Tutorial"
msgstr ""
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
msgid "Turn"
msgstr ""
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
msgid "Scenario Start"
msgstr ""
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
msgid "No Saved Games"
msgstr ""
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
msgid ""
"There are no saved games to load.\n"
"(Games are saved automatically when you complete a scenario)"
msgstr ""
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
msgid "Delete Save"
msgstr ""
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
msgid "Import Saved Games"
msgstr ""
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
msgid ""
"Your saves directory contains some files from an old version of Battle for "
"Wesnoth. Would you like to update these to the latest version? This may take "
"some time."
msgstr ""
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
msgid ""
"Your saves directory contains some files that don't appear to have been "
"generated by this version of Battle for Wesnoth. Would you like to register "
"these files with the game?"
msgstr ""
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
msgid "Show replay"
msgstr ""
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
msgid "Load Game"
msgstr ""
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
msgid "Ok"
msgstr ""
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
msgid "Cancel"
msgstr ""
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
msgid "level"
msgstr ""
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
#: src/unit.cpp:1087
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
msgid "ranged"
msgstr ""
@@ -15076,11 +15100,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
msgid "The game could not be saved"
msgstr ""
@@ -15167,83 +15191,83 @@
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
-#: src/help.cpp:568
+#: src/help.cpp:569
msgid "Advances to"
msgstr ""
-#: src/help.cpp:594
+#: src/help.cpp:595
msgid "Abilities"
msgstr ""
-#: src/help.cpp:617
+#: src/help.cpp:618
msgid "Alignment"
msgstr ""
-#: src/help.cpp:622
+#: src/help.cpp:623
msgid "Required XP"
msgstr ""
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
msgid "attacks"
msgstr ""
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
msgid "Name"
msgstr ""
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
msgid "Type"
msgstr ""
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
msgid "Dmg"
msgstr ""
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
msgid "Strikes"
msgstr ""
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
msgid "Range"
msgstr ""
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
msgid "Special"
msgstr ""
-#: src/help.cpp:717
+#: src/help.cpp:718
msgid "Resistances"
msgstr ""
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
msgid "Attack Type"
msgstr ""
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
msgid "Resistance"
msgstr ""
-#: src/help.cpp:757
+#: src/help.cpp:758
msgid "Terrain Modifiers"
msgstr ""
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
msgid "Terrain"
msgstr ""
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
msgid "Defense"
msgstr ""
-#: src/help.cpp:1867
+#: src/help.cpp:1868
msgid "< Back"
msgstr ""
-#: src/help.cpp:1868
+#: src/help.cpp:1869
msgid "Forward >"
msgstr ""
-#: src/help.cpp:2366
+#: src/help.cpp:2367
msgid "The Battle for Wesnoth Help"
msgstr ""
@@ -15255,7 +15279,7 @@
msgid "End Unit Turn"
msgstr ""
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
msgid "Leader"
msgstr ""
@@ -15291,7 +15315,7 @@
msgid "Unit Description"
msgstr ""
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
msgid "Rename Unit"
msgstr ""
@@ -15335,7 +15359,7 @@
msgid "Change Unit Side (Debug!)"
msgstr ""
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
msgid "Preferences"
msgstr ""
@@ -15343,11 +15367,11 @@
msgid "Scenario Objectives"
msgstr ""
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
msgid "Unit List"
msgstr ""
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
msgid "Statistics"
msgstr ""
@@ -15451,7 +15475,7 @@
msgid "Speak to All"
msgstr ""
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
msgid "Help"
msgstr ""
@@ -15475,7 +15499,7 @@
msgid "System default language"
msgstr ""
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
msgid "Close Window"
msgstr ""
@@ -15483,7 +15507,7 @@
msgid "Map Generator"
msgstr ""
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
msgid "Players"
msgstr ""
@@ -15503,7 +15527,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
msgid "Villages"
msgstr ""
@@ -15511,23 +15535,23 @@
msgid "Landform"
msgstr ""
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
msgid "Roads Between Castles"
msgstr ""
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
msgid "/1000 tiles"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Coastal"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Inland"
msgstr ""
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
msgid "Island"
msgstr ""
@@ -15599,35 +15623,31 @@
msgid "Name of game"
msgstr ""
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
-msgstr ""
-
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
msgstr ""
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
msgid "Map to play"
msgstr ""
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
msgid "Era"
msgstr ""
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
msgid "Unlimited"
msgstr ""
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
msgid "Turns"
msgstr ""
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
msgid "Village Gold"
msgstr ""
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
msgid "Experience Requirements"
msgstr ""
@@ -15639,9 +15659,9 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
msgid "Gold"
msgstr ""
@@ -15686,11 +15706,11 @@
msgstr ""
#: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
msgstr ""
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
msgstr ""
#: src/multiplayer_connect.cpp:97
@@ -15711,8 +15731,8 @@
msgid "Local Player"
msgstr ""
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
msgid "Computer Player"
msgstr ""
@@ -15720,64 +15740,64 @@
msgid "Empty"
msgstr ""
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
msgid "Team"
msgstr ""
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
msgid "Red"
msgstr ""
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
msgid "Blue"
msgstr ""
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
msgid "Green"
msgstr ""
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
msgid "Yellow"
msgstr ""
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
msgid "Purple"
msgstr ""
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
msgid "Orange"
msgstr ""
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
msgid "Grey"
msgstr ""
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
msgid "White"
msgstr ""
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
msgid "Brown"
msgstr ""
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
msgid "Game Lobby"
msgstr ""
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
msgid "Player/Type"
msgstr ""
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
msgid "Race"
msgstr ""
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
msgid "Color"
msgstr ""
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
msgid "Waiting for network players to join"
msgstr ""
@@ -15860,208 +15880,224 @@
"want to save the game?"
msgstr ""
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
msgid "Melee"
msgstr ""
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
msgid "Units"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
msgid "Recruit unit"
msgstr ""
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "her"
msgstr ""
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
msgid "him"
msgstr ""
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
msgid "You are seperated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
msgid "You must have at least"
msgstr ""
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
msgid "gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
msgid "Location"
msgstr ""
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -16076,177 +16112,177 @@
msgid "player"
msgstr ""
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
msgid "Full Screen"
msgstr ""
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
msgid "Accelerated Speed"
msgstr ""
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
msgid "Skip AI Moves"
msgstr ""
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
msgid "Show Grid"
msgstr ""
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
msgid "Show Floating Labels"
msgstr ""
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
msgid "Turn Dialog"
msgstr ""
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
msgid "Turn Bell"
msgstr ""
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
msgid "Show Team Colors"
msgstr ""
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
msgid "Show Color Cursors"
msgstr ""
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
msgid "Show Haloing Effects"
msgstr ""
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
msgid "Video Mode"
msgstr ""
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
msgid "Hotkeys"
msgstr ""
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
msgid "Adjust Gamma"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "Music Volume:"
msgstr ""
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
msgid "SFX Volume:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Gamma:"
msgstr ""
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
msgid "Scroll Speed:"
msgstr ""
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
msgid "Change the sound effects volume"
msgstr ""
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
msgid "Change the music volume"
msgstr ""
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
msgid "Change the speed of scrolling around the map"
msgstr ""
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
msgid "Change the brightness of the display"
msgstr ""
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
msgid "Choose whether the game should run full screen or in a window"
msgstr ""
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
msgid "Make units move and fight faster"
msgstr ""
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
msgid "Do not animate AI units moving"
msgstr ""
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
msgid "Overlay a grid onto the map"
msgstr ""
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
msgid "Show text above a unit when it is hit to display damage inflicted"
msgstr ""
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
msgid "Change the resolution the game runs at"
msgstr ""
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
msgid "Display a dialog at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
msgid "Play a bell sound at the beginning of your turn"
msgstr ""
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
msgid ""
"Show a colored circle around the base of each unit to show which side it is "
"on"
msgstr ""
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
msgid "Use colored mouse cursors (may be slower)"
msgstr ""
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
msgid "Use graphical special effects (may be slower)"
msgstr ""
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
msgid "View and configure keyboard shortcuts"
msgstr ""
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
msgid "Prefs section^General"
msgstr ""
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
msgid "Prefs section^Display"
msgstr ""
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
msgid "Prefs section^Sound"
msgstr ""
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
msgid "There are no alternative video modes available"
msgstr ""
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
msgid "Choose Resolution"
msgstr ""
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
msgid "Hotkey Settings"
msgstr ""
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
msgid "Press desired HotKey"
msgstr ""
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
msgid "Change Hotkey"
msgstr ""
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
msgid "Save Hotkeys"
msgstr ""
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
msgid "This HotKey is already in use."
msgstr ""
@@ -16306,7 +16342,7 @@
msgid "Allied"
msgstr ""
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
msgid "KB"
msgstr ""
Index: wesnoth/src/Makefile.in
diff -u wesnoth/src/Makefile.in:1.61 wesnoth/src/Makefile.in:1.62
--- wesnoth/src/Makefile.in:1.61 Fri Aug 27 16:44:57 2004
+++ wesnoth/src/Makefile.in Sat Aug 28 04:51:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -1138,16 +1138,14 @@
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
- empty_fix=.; \
else \
include_option=--include; \
- empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
+ test -f $$subdir/TAGS && \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -1157,11 +1155,9 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.117 wesnoth/src/multiplayer.cpp:1.118
--- wesnoth/src/multiplayer.cpp:1.117 Fri Aug 27 11:13:37 2004
+++ wesnoth/src/multiplayer.cpp Sat Aug 28 04:51:51 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.117 2004/08/27 11:13:37 isaaccp Exp $ */
+/* $Id: multiplayer.cpp,v 1.118 2004/08/28 04:51:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -491,7 +491,12 @@
{
std::cerr << "calling start_game()\n";
const network::manager net_manager;
- const network::server_manager server_man(15000,server_);
+ const network::server_manager server_man(15000,server_ ?
network::server_manager::TRY_CREATE_SERVER :
network::server_manager::NO_SERVER);
+
+ if(server_ && server_man.is_running() == false) {
+ gui::show_dialog(disp_,NULL,_("Warning"),_("The game was unable
to bind to the port needed to host games over the network. Network players will
be unable to connect to this game"),
+ gui::OK_ONLY);
+ }
turns_restorer_ = surface_restorer();
village_gold_restorer_ = surface_restorer();
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.41 wesnoth/src/network.cpp:1.42
--- wesnoth/src/network.cpp:1.41 Sat Aug 28 04:26:14 2004
+++ wesnoth/src/network.cpp Sat Aug 28 04:51:51 2004
@@ -170,10 +170,19 @@
}
}
-server_manager::server_manager(int port, bool create_server) : free_(false)
+server_manager::server_manager(int port, CREATE_SERVER create_server) :
free_(false)
{
- if(create_server && !server_socket) {
- server_socket = get_socket(connect("",port));
+ if(create_server != NO_SERVER && !server_socket) {
+ try {
+ server_socket = get_socket(connect("",port));
+ } catch(network::error& e) {
+ if(create_server == MUST_CREATE_SERVER) {
+ throw e;
+ } else {
+ return;
+ }
+ }
+
std::cerr << "server socket initialized: " << server_socket <<
"\n";
free_ = true;
}
@@ -187,6 +196,11 @@
}
}
+bool server_manager::is_running() const
+{
+ return static_cast<bool>(server_socket);
+}
+
size_t nconnections()
{
return sockets.size();
Index: wesnoth/src/network.hpp
diff -u wesnoth/src/network.hpp:1.17 wesnoth/src/network.hpp:1.18
--- wesnoth/src/network.hpp:1.17 Wed Jul 28 03:38:19 2004
+++ wesnoth/src/network.hpp Sat Aug 28 04:51:51 2004
@@ -24,11 +24,19 @@
//a server manager causes listening on a given port to occur
//for the duration of its lifetime.
struct server_manager {
- //if create_server is false, then the object has no effect.
+
+ //parameter to pass to the constructor.
+
+ enum CREATE_SERVER { MUST_CREATE_SERVER, //will throw exception on
failure
+ TRY_CREATE_SERVER, //will swallow failure
+ NO_SERVER }; //won't try to create a server at all
+
//throws error.
- server_manager(int port, bool create_server=true);
+ server_manager(int port, CREATE_SERVER
create_server=MUST_CREATE_SERVER);
~server_manager();
+ bool is_running() const;
+
private:
bool free_;
};
Index: wesnoth/src/server/Makefile.in
diff -u wesnoth/src/server/Makefile.in:1.36 wesnoth/src/server/Makefile.in:1.37
--- wesnoth/src/server/Makefile.in:1.36 Fri Aug 27 16:24:43 2004
+++ wesnoth/src/server/Makefile.in Sat Aug 28 04:51:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -505,11 +505,9 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: wesnoth/src/tools/Makefile.in
diff -u wesnoth/src/tools/Makefile.in:1.34 wesnoth/src/tools/Makefile.in:1.35
--- wesnoth/src/tools/Makefile.in:1.34 Fri Aug 27 16:24:43 2004
+++ wesnoth/src/tools/Makefile.in Sat Aug 28 04:51:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -596,11 +596,9 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.47 wesnoth/src/unit_types.hpp:1.48
--- wesnoth/src/unit_types.hpp:1.47 Wed Aug 25 02:59:51 2004
+++ wesnoth/src/unit_types.hpp Sat Aug 28 04:51:51 2004
@@ -1,4 +1,4 @@
-/* $Id: unit_types.hpp,v 1.47 2004/08/25 02:59:51 Sirp Exp $ */
+/* $Id: unit_types.hpp,v 1.48 2004/08/28 04:51:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,7 +27,9 @@
{
public:
struct frame {
- frame() {}
+ frame() : xoffset(0), halo_x(0), halo_y(0) {}
+ explicit frame(const std::string& str) : xoffset(0), image(str),
+ halo_x(0), halo_y(0) {}
explicit frame(const config& cfg);
// int start, end;
Index: wesnoth/src/zip/Makefile.in
diff -u wesnoth/src/zip/Makefile.in:1.19 wesnoth/src/zip/Makefile.in:1.20
--- wesnoth/src/zip/Makefile.in:1.19 Fri Aug 27 16:24:43 2004
+++ wesnoth/src/zip/Makefile.in Sat Aug 28 04:51:51 2004
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -486,11 +486,9 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- [Wesnoth-cvs-commits] wesnoth ./Makefile.in ./aclocal.m4 ./configure ...,
David White <=