[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/themes/editor.cfg data/translation...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth data/themes/editor.cfg data/translation... |
|
Date: |
Thu, 02 Sep 2004 18:29:56 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/09/02 22:25:07
Modified files:
data/themes : editor.cfg
data/translations: english.cfg
po : Makefile.in.in wesnoth.pot
Added files:
po/wesnoth : FINDCFG
Log message:
fixed install and dist target in po/
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/editor.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/translations/english.cfg.diff?tr1=1.162&tr2=1.163&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/Makefile.in.in.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth.pot.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/FINDCFG?rev=1.1
Patches:
Index: wesnoth/data/themes/editor.cfg
diff -u wesnoth/data/themes/editor.cfg:1.21 wesnoth/data/themes/editor.cfg:1.22
--- wesnoth/data/themes/editor.cfg:1.21 Thu Jul 1 22:21:00 2004
+++ wesnoth/data/themes/editor.cfg Thu Sep 2 22:25:06 2004
@@ -213,7 +213,7 @@
[/main_map]
[menu]
- title=edit_main_menu
+ title=_"File"
image=lite
items=editnewmap,editloadmap,editsaveas,editsavemap,editrevert,preferences,editquit
rect=3,1,103,22
@@ -222,7 +222,7 @@
[/menu]
[menu]
- title=edit_operations_menu
+ title=_"Edit"
image=lite
items=undo,redo,editcut,editcopy,editselectall,editfillselection,editresize,editflip
rect=107,1,207,22
@@ -230,7 +230,7 @@
# The toolbar.
[menu]
- title="Draw"
+ title=_"Draw"
image=lite_small
items=editdraw
rect=900,250,955,271
@@ -239,7 +239,7 @@
[/menu]
[menu]
- title="Flood"
+ title=_"Flood"
image=lite_small
items=editfloodfill
rect=960,250,1015,271
@@ -248,7 +248,7 @@
[/menu]
[menu]
- title="Start P"
+ title=_"Start P"
image=lite_small
items=editsetstartpos
rect=900,275,955,296
@@ -257,7 +257,7 @@
[/menu]
[menu]
- title="Paste"
+ title=_"Paste"
image=lite_small
items=editpaste
rect=960,275,1015,296
Index: wesnoth/data/translations/english.cfg
diff -u wesnoth/data/translations/english.cfg:1.162
wesnoth/data/translations/english.cfg:1.163
--- wesnoth/data/translations/english.cfg:1.162 Thu Sep 2 11:44:42 2004
+++ wesnoth/data/translations/english.cfg Thu Sep 2 22:25:06 2004
@@ -176,12 +176,6 @@
village_name_hill= _ "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
village_name_mountain= _
"$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
-#Map editor strings.
-
-edit_choose_file_save_as= _ "Choose a File to Save As"
-edit_operations_menu= _ "Edit"
-edit_main_menu= _ "File"
-
show_next_tip= _ "Next tip"
tip_of_day= _ "Tip of the Day"
no_tip_of_day= _ "Do not show tips"
Index: wesnoth/po/Makefile.in.in
diff -u wesnoth/po/Makefile.in.in:1.5 wesnoth/po/Makefile.in.in:1.6
--- wesnoth/po/Makefile.in.in:1.5 Thu Sep 2 16:45:24 2004
+++ wesnoth/po/Makefile.in.in Thu Sep 2 22:25:06 2004
@@ -47,8 +47,7 @@
DUMMYPOFILES = @DUMMYPOFILES@
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2)
$(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
-$(POFILES) $(GMOFILES) \
+DISTFILES = $(DISTFILES.common) Makevars DOMAINS POTFILES.in $(DOMAIN).pot
stamp-po \
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
POTFILES = \
@@ -93,7 +92,7 @@
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
test -z "$(GMOFILES)" || \
- for domain in `cat DOMAINS`; do \
+ for domain in `cat $(srcdir)/DOMAINS`; do \
$(MAKE) DOMAIN=$$domain $(GMOFILES) ;\
done
@echo "touch stamp-po"
@@ -114,19 +113,16 @@
--msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' \
--keyword=_ --keyword=N_ \
--output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
- ../utils/wmlxgettext \
- `cd $(top_srcdir) && find data -name '*.cfg'` > $(DOMAIN).wml.po
-# $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-# --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-# `cd $(top_srcdir) && find data -name '*.cfg'` \
-# --copyright-holder='$(COPYRIGHT_HOLDER)' \
-# --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' \
-# --keyword=_ --language=Shell \
-# --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).wml.po
- test ! -f $(DOMAIN).cpp.po -o ! -f $(DOMAIN).wml.po || { \
+ if test -r $(DOMAIN)/FINDCFG ;\
+ then ../utils/wmlxgettext \
+ `cd $(top_srcdir) && sh po/$(DOMAIN)/FINDCFG` > $(DOMAIN).wml.po ;\
+ fi
+ if test -f $(DOMAIN).wml.po ; then \
msgcat --sort-by-file $(DOMAIN).cpp.po $(DOMAIN).wml.po -o
$(DOMAIN).po && \
rm -f $(DOMAIN).cpp.po $(DOMAIN).wml.po; \
- }
+ else \
+ mv $(DOMAIN).cpp.po $(DOMAIN).po ;\
+ fi
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
@@ -185,9 +181,10 @@
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat;
fi; \
- $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
- echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+ for domain in `cat $(srcdir)/DOMAINS`; do \
+ if test -r $$cat; then realcat=$$domain/$$cat; else
realcat=$(srcdir)/$$domain/$$cat; fi; \
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$$domain.mo; \
+ echo "installing $$realcat as $(DESTDIR)$$dir/$$domain.mo"; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc
2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -209,13 +206,14 @@
mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
fi; \
fi; \
- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
- ln -s ../LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
- ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
- cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
- echo "installing $$realcat link as
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$$domain.mo; \
+ ln -s ../LC_MESSAGES/$$domain.mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$$domain.mo 2>/dev/null || \
+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$$domain.mo 2>/dev/null || \
+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$$domain.mo; \
+ echo "installing $$realcat link as
$(DESTDIR)$(localedir)/$$lang/$$lc/$$domain.mo"; \
fi; \
done; \
+ done; \
done
install-strip: install
@@ -282,7 +280,9 @@
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ for domain in `cat $(srcdir)/DOMAINS`; do \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$$domain.mo; \
+ done;
done; \
done
@@ -325,18 +325,37 @@
fi; \
done; \
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+ for domain in `cat $(srcdir)/DOMAINS`; do \
+ for file in $(POFILES) $(GMOFILES); do \
+ dists="$$dists $$domain/$$file"; \
+ done; \
+ for file in POTFILES.in FINDCFG; do \
+ dists="$$dists $$domain/$$file"; \
+ done; \
+ done; \
for file in $$dists; do \
+ base=`basename $$file`; \
+ if test $$base = $$file; then \
+ dir=""; \
+ else \
+ dir=`dirname $$file`; \
+ if ! test -d $(distdir)/$$dir; then \
+ mkdir $(distdir)/$$dir; \
+ fi; \
+ fi; \
if test -f $$file; then \
- cp -p $$file $(distdir); \
+ cp -p $$file $(distdir)/$$dir; \
else \
- cp -p $(srcdir)/$$file $(distdir); \
+ cp -p $(srcdir)/$$file $(distdir)/$$dir; \
fi; \
done
update-po: Makefile
- $(MAKE) $(DOMAIN).pot-update
- test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
- $(MAKE) update-gmo
+ for domain in `cat $(srcdir)/DOMAINS`; do \
+ $(MAKE) $$domain.pot-update; \
+ test -z "$(UPDATEPOFILES)" || $(MAKE) DOMAIN=$$domain
$(UPDATEPOFILES); \
+ $(MAKE) DOMAIN=$$domain update-gmo; \
+ done
# General rule for creating PO files.
@@ -353,22 +372,22 @@
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ echo "$${cdcmd}$(MSGMERGE) $(DOMAIN)/$$lang.po $(DOMAIN).pot -o
$(DOMAIN)/$$lang.new.po"; \
cd $(srcdir); \
- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
- if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
+ if $(MSGMERGE) $(DOMAIN)/$$lang.po $(DOMAIN).pot -o
$$tmpdir/$(DOMAIN)/$$lang.new.po; then \
+ if cmp $(DOMAIN)/$$lang.po $$tmpdir/$(DOMAIN)/$$lang.new.po
>/dev/null 2>&1; then \
+ rm -f $$tmpdir/$(DOMAIN)/$$lang.new.po; \
else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ if mv -f $$tmpdir/$(DOMAIN)/$$lang.new.po $(DOMAIN)/$$lang.po; then
\
:; \
else \
- echo "msgmerge for $$lang.po failed: cannot move
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ echo "msgmerge for $(DOMAIN)/$$lang.po failed: cannot move
$$tmpdir/$(DOMAIN)/$$lang.new.po to $(DOMAIN)/$$lang.po" 1>&2; \
exit 1; \
fi; \
fi; \
else \
- echo "msgmerge for $$lang.po failed!" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
+ echo "msgmerge for $(DOMAIN)/$$lang.po failed!" 1>&2; \
+ rm -f $$tmpdir/$(DOMAIN)/$$lang.new.po; \
fi
$(DUMMYPOFILES):
Index: wesnoth/po/wesnoth.pot
diff -u wesnoth/po/wesnoth.pot:1.15 wesnoth/po/wesnoth.pot:1.16
--- wesnoth/po/wesnoth.pot:1.15 Wed Sep 1 17:17:46 2004
+++ wesnoth/po/wesnoth.pot Thu Sep 2 22:25:07 2004
@@ -10,7 +10,7 @@
"#-#-#-#-# wesnoth.cpp.po (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-09-01 18:45+0200\n"
+"POT-Creation-Date: 2004-09-02 22:54+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -7977,8 +7977,7 @@
#: data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:404
msgid ""
-"You monster! You've betrayed our people- - to ally youself with with these "
-"Orcs?!"
+"You monster! You've betrayed our people- - to ally youself with these Orcs?!"
msgstr ""
#: data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:412
@@ -12316,139 +12315,31 @@
"$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
msgstr ""
-#: data/translations/english.cfg:181
-msgid "Choose a File to Save As"
-msgstr ""
-
-#: data/translations/english.cfg:182
-msgid "The map already exists. Do you want to overwrite it?"
-msgstr ""
-
-#: data/translations/english.cfg:183
-msgid "Which Player?"
-msgstr ""
-
-#: data/translations/english.cfg:184
-msgid "Which player should start here?"
-msgstr ""
-
-#: data/translations/english.cfg:185
-msgid "Choose a Map to Load"
-msgstr ""
-
-#: data/translations/english.cfg:186
-msgid "The file does not contain a valid map."
-msgstr ""
-
-#: data/translations/english.cfg:187
-msgid "'$filename' does not exist or can not be read as a file."
-msgstr ""
-
-#: data/translations/english.cfg:188
-msgid "Load failed: "
-msgstr ""
-
-#: data/translations/english.cfg:189
-msgid "You must have a hex selected on the board."
-msgstr ""
-
-#: data/translations/english.cfg:190
-msgid "Do you want to save the map before quitting?"
-msgstr ""
-
-#: data/translations/english.cfg:191
-msgid "Map saved."
-msgstr ""
-
-#: data/translations/english.cfg:192
-msgid "Could not save the map: $msg"
-msgstr ""
-
-#: data/translations/english.cfg:193
-msgid "Player "
-msgstr ""
-
-#: data/translations/english.cfg:194
-msgid "Your modifications to the map will be lost. Continue?"
-msgstr ""
-
-#: data/translations/english.cfg:195
-msgid "Create New Map"
-msgstr ""
-
-#: data/translations/english.cfg:196
-msgid "Generate New Map"
-msgstr ""
-
-#: data/translations/english.cfg:197
-msgid "Generate Random Map"
-msgstr ""
-
-#: data/translations/english.cfg:198
-msgid "Random Generator Settings"
-msgstr ""
-
-#: data/translations/english.cfg:199
-msgid "Map creation failed."
-msgstr ""
-
-#: data/translations/english.cfg:200 src/hotkeys.cpp:164
-msgid "Resize Map"
-msgstr ""
-
-#: data/translations/english.cfg:201
-msgid "X-Axis"
-msgstr ""
-
-#: data/translations/english.cfg:202
-msgid "Y-Axis"
-msgstr ""
-
-#: data/translations/english.cfg:203
-msgid "Flip around (this may change the dimensions of the map):"
-msgstr ""
-
-#: data/translations/english.cfg:204
-msgid "Edit"
-msgstr ""
-
-#: data/translations/english.cfg:205
-msgid "File"
-msgstr ""
-
-#: data/translations/english.cfg:206
-msgid "FG"
-msgstr ""
-
-#: data/translations/english.cfg:207
-msgid "BG"
-msgstr ""
-
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:179
msgid "Next tip"
msgstr ""
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:180
msgid "Tip of the Day"
msgstr ""
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:181
msgid "Do not show tips"
msgstr ""
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:182
msgid ""
"Lawful units fight better at day, and chaotic units fight better at night. "
"Neutral units are unaffected by day and night."
msgstr ""
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:183
msgid ""
"In a campaign, you can use veteran units from previous scenarios by using "
"the 'recall' option."
msgstr ""
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:184
msgid ""
"There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
"Different units have weaknesses against different types of attacks. Right-"
@@ -12457,7 +12348,7 @@
"types."
msgstr ""
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:185
msgid ""
"The terrain your units are on determines the chance your opponents have of "
"hitting them in battle. The defensive rating for the currently selected unit "
@@ -12465,7 +12356,7 @@
"the screen."
msgstr ""
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:186
msgid ""
"Poisoned units lose 8 hitpoints every turn, but they will not die from "
"poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -12473,83 +12364,83 @@
"the 'cure' ability."
msgstr ""
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:187
msgid ""
"You can use units from a previous scenario by selecting 'Recall' by the game "
"menu. By recalling the same units over and over, you can build up a powerful "
"and experienced army."
msgstr ""
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:188
msgid ""
"All units have a Zone of Control in each of the hexes next to them. If a "
"unit moves into an enemy's Zone of Control, it may not move any further that "
"turn."
msgstr ""
-#: data/translations/english.cfg:219
+#: data/translations/english.cfg:189
msgid ""
"The chance to hit a unit usually depends on how well that unit can defend "
"itself in the terrain it is standing in, however magical attacks always have "
"a 70% chance to hit, and marksman attacks have at least 60% chance to hit."
msgstr ""
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:190
msgid ""
"Units stationed in villages heal 8 hitpoints at the beginning of their turn."
msgstr ""
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:191
msgid ""
"Units that do not move or attack during their turn rest, and will recover 2 "
"hitpoints at the beginning of their next turn."
msgstr ""
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:192
msgid ""
"Most foot units defend better in villages and castles than in most other "
"terrain, while most mounted units don't get any defensive advantage in "
"villages and castles."
msgstr ""
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:193
msgid ""
"Horse based units are generally resistant to attacks with bladed or impact "
"weapons, but are vulnerable to attacks with piercing weapons, including bows "
"and spears."
msgstr ""
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:194
msgid ""
"Inflicting the killing blow on an enemy unit is the best way to gain "
"experience. Units killing an enemy will gain 8 experience for every level of "
"the unit they kill."
msgstr ""
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:195
msgid ""
"Elvish units move and fight very well in forest. Dwarvish units move and "
"fight very well in hills and mountains."
msgstr ""
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:196
msgid ""
"Patience is often key. Rather than attacking in bad conditions, or with few "
"troops, wait for better conditions and then attack."
msgstr ""
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:197
msgid ""
"If you are attacked from several directions, it may be a good idea to send "
"expendable units in some directions to delay enemy units."
msgstr ""
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:198
msgid ""
"Do not be afraid to retreat and regroup, it is often the key to victory."
msgstr ""
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:199
msgid ""
"In most campaigns you will receive a gold bonus for finishing early, "
"depending on the number of villages on the map, and the number of turns you "
@@ -12557,7 +12448,7 @@
"villages and waiting for turns to run out."
msgstr ""
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:200
msgid ""
"Your leader can recruit or recall units from any keep inside a castle, not "
"just the keep they start on. You can capture a keep from an enemy and "
@@ -12565,75 +12456,75 @@
"for you on their keep so you can recruit there."
msgstr ""
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:201
msgid ""
"Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
"impact, fire, and holy attacks."
msgstr ""
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:202
msgid ""
"Units with leadership ability make lower level adjacent units on the same "
"side fight better."
msgstr ""
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:203
msgid ""
"Generally avoid moving next to an unoccupied village. An enemy unit may move "
"onto the village and attack you, while enjoying the defense and healing of "
"the village."
msgstr ""
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:204
msgid ""
"Holding the mouse cursor on an ability or trait shows a description of that "
"ability or trait."
msgstr ""
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:205
msgid "Use lines of units to screen injured units to let them recover."
msgstr ""
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:206
msgid "Read the hotkeys list in the preferences menu."
msgstr ""
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:207
msgid ""
"If you move a unit, but don't attack or discover any additional information, "
"you can undo your move by pressing 'u'."
msgstr ""
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:208
msgid ""
"You can see how far enemy units can move by moving the mouse cursor over "
"them."
msgstr ""
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:209
msgid ""
"Use healers to support your attacks - they will win you battles without "
"needing to attack anything themselves."
msgstr ""
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:210
msgid ""
"The 'slow' attack ability makes enemy units move slower, but it also gives "
"them one less attack than they would normally have. It is thus very "
"effective against units that have a few powerful attacks."
msgstr ""
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:211
msgid "Holy attacks are very powerful against undead."
msgstr ""
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:212
msgid ""
"Units are healed when they advance a level. Used wisely, this can turn a "
"fight."
msgstr ""
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:213
msgid ""
"Charging units are best used against enemies they can kill with a single "
"blow."
@@ -15521,48 +15412,37 @@
msgid "Choose the game to load"
msgstr ""
-#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:442
-#: src/show_dialog.cpp:455
-msgid "Ok"
-msgstr ""
-
-#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:119
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:456
-#: src/show_dialog.cpp:462
-msgid "Cancel"
-msgstr ""
-
-#: src/dialogs.cpp:617 src/dialogs.cpp:626
+#: src/dialogs.cpp:550 src/dialogs.cpp:559
msgid "Profile"
msgstr ""
-#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:563
+#: src/dialogs.cpp:646 src/display.cpp:884 src/help.cpp:563
#: src/playturn.cpp:1738
msgid "level"
msgstr ""
-#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:617
+#: src/dialogs.cpp:667 src/display.cpp:902 src/help.cpp:617
#: src/playturn.cpp:1902 src/unit.cpp:1034
msgid "HP"
msgstr ""
-#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/dialogs.cpp:671 src/dialogs.cpp:679 src/display.cpp:906
#: src/display.cpp:914 src/playturn.cpp:1740 src/playturn.cpp:1903
#: src/unit.cpp:1093
msgid "XP"
msgstr ""
-#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:618
+#: src/dialogs.cpp:684 src/display.cpp:918 src/help.cpp:618
#: src/playturn.cpp:1904 src/unit.cpp:1070
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:695
+#: src/dialogs.cpp:697 src/display.cpp:935 src/help.cpp:695
#: src/playturn.cpp:618 src/reports.cpp:230
msgid "melee"
msgstr ""
-#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:695
+#: src/dialogs.cpp:698 src/display.cpp:936 src/help.cpp:695
#: src/playturn.cpp:618 src/reports.cpp:231
msgid "ranged"
msgstr ""
@@ -15654,11 +15534,11 @@
msgid "Choose your preferred language"
msgstr ""
-#: src/game.cpp:1133
+#: src/game.cpp:1136
msgid "Could not initialize video. Exiting.\n"
msgstr ""
-#: src/game.cpp:1135
+#: src/game.cpp:1138
msgid "Could not initialize fonts. Exiting.\n"
msgstr ""
@@ -15910,6 +15790,10 @@
msgid "Revert from Disk"
msgstr ""
+#: src/hotkeys.cpp:164
+msgid "Resize Map"
+msgstr ""
+
#: src/hotkeys.cpp:165
msgid "Flip Map"
msgstr ""
@@ -16070,6 +15954,16 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:119
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:456
+#: src/show_dialog.cpp:462
+msgid "Cancel"
+msgstr ""
+
+#: src/multiplayer.cpp:121 src/show_dialog.cpp:442 src/show_dialog.cpp:455
+msgid "Ok"
+msgstr ""
+
#: src/multiplayer.cpp:123
msgid "Regenerate"
msgstr ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/themes/editor.cfg data/translation...,
Yann Dirson <=