Merge branch 'master' of https://github.com/wesnoth/wesnoth
This commit is contained in:
Chris Beck
commit
978d05701f
23 changed files with 864 additions and 214 deletions
|
|
@ -5,6 +5,7 @@ Version 1.13.0-dev:
|
|||
least one add-on that may be upgraded.
|
||||
* Add-ons server:
|
||||
* Add-on metadata pattern blacklisting implemented.
|
||||
* Major internal refactoring done.
|
||||
* AI:
|
||||
* New Micro AI: Fast AI
|
||||
* Messenger Escort Micro AI: new optional parameters [filter],
|
||||
|
|
@ -50,6 +51,8 @@ Version 1.13.0-dev:
|
|||
* Northern Rebirth:
|
||||
* Fixed Sister Thera and Father Morvin respawning into the recall list if
|
||||
the other is on the north or west map edges.
|
||||
* Sceptre of Fire:
|
||||
* Balancing changes for 'The Dragon'.
|
||||
* Son of the Black Eye:
|
||||
* S2: adjusted starting villages; scenario now ends if Kapou'e is already
|
||||
on the signpost when the messenger comes back
|
||||
|
|
@ -298,8 +301,6 @@ Version 1.13.0-dev:
|
|||
* Add [has_ally], [has_enemy] to work around issues reported here: http://forums.wesnoth.org/viewtopic.php?f=21&t=40702
|
||||
In a side_filter, [has_ally] and [has_enemy] are corrected / simplified versions of [allied_with] / [enemy_of], this
|
||||
is an extension of the bugfixes for [filter_vision].
|
||||
* Mushroom Grove and Lit Mushroom Grove now favor the terrain with the worst
|
||||
movement costs between the base and overlay (bug #21971).
|
||||
* Fix [side] share_view/maps always beeing false for non-first levels in mp campaigns
|
||||
* Fixes start-of-scenario multiplaer saves (#22068)
|
||||
* Fix bug wherein "lobby sounds" advanced preference didn't do anything for the normal (GUI 1) lobby.
|
||||
|
|
|
|||
|
|
@ -250,6 +250,7 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Garrugch
|
||||
# wmllint: local spelling slavemaster
|
||||
message= _ "Idle threats. Time as a slavemaster has made you weak. You have the strength of a goblin, and the brains to match. This land now belongs to my master. Surrender now and he might let you be (<i>his</i>) slave."
|
||||
[/message]
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -2462,6 +2462,9 @@
|
|||
[entry]
|
||||
name = "Jurgis Sūdžius (Dievas)"
|
||||
[/entry]
|
||||
[entry]
|
||||
name = "Lukas Gasiūnas (LucasLT)"
|
||||
[/entry]
|
||||
[entry]
|
||||
name = "Marius Tauba (morlock)"
|
||||
[/entry]
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
id=..editor
|
||||
title= _ "Map/Scenario Editor"
|
||||
generator="contents:editor"
|
||||
text= _ "A look at the editor's control mechanisms.
|
||||
text= _ "A look at the editor’s control mechanisms.
|
||||
|
||||
"
|
||||
[/topic]
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
id=editor_modes
|
||||
title= _ "Editing Modes"
|
||||
|
||||
text= _ "The editor features two seperate modes of operation:" + _ "
|
||||
text= _ "The editor features two separate modes of operation:" + _ "
|
||||
|
||||
<header>text='Pure Map Mode'</header>" + _ "
|
||||
|
||||
|
|
@ -30,11 +30,11 @@ How the information is saved depends on the loaded file:
|
|||
<italic>text='Native'</italic>" + _ "
|
||||
A new map or file containing only the arguments to the map_data attribute.
|
||||
|
||||
The produced map can be played in the 'User Maps' game type at the create multiplayer game dialog if saved to the default directory.
|
||||
For using it in handwritten scenario files the UMC Designer uses the map_data=\"Path/to/file/my.map\" TODO include brakes can't be escaped holy shit syntax." + _ "
|
||||
The produced map can be played in the “User Maps” game type at the create multiplayer game dialog if saved to the default directory.
|
||||
For using it in handwritten scenario files the UMC designer uses the map_data=\"Path/to/file/my.map\" TODO include brakes can't be escaped holy shit syntax." + _ "
|
||||
|
||||
<italic>text='Embeded'</italic>" + _ "
|
||||
Openening a handwritten (sourrounded by [scenario], [multiplayer] or [test]) scenario file which contain a valid map_data attribute (not a file include) will open them in this submode. The editor replaces only the content of map_data and leaves everything else in the scenario untouched. Maps being in this submode are marked [e] in the map menu.
|
||||
<italic>text='Embedded'</italic>" + _ "
|
||||
Handwritten (surrounded by [scenario], [multiplayer] or [test] tags) scenario files containing a valid map_data attribute (not a file include) will be opened in this submode. The editor replaces only the content of map_data and leaves everything else in the scenario untouched. Maps being in this submode are marked [e] in the map menu.
|
||||
" + _ "
|
||||
|
||||
<header>text='Scenario Mode'</header>" + _ "
|
||||
|
|
|
|||
|
|
@ -845,8 +845,7 @@ Most units receive 20 to 40% defense in sand."
|
|||
name= _ "Mushroom Grove"
|
||||
editor_name= _ "Mushroom Grove"
|
||||
string=^Uf
|
||||
aliasof=_bas,Uft
|
||||
mvt_alias=-,_bas,Uft
|
||||
aliasof=Uft
|
||||
default_base=Uu
|
||||
editor_group=cave, forest
|
||||
[/terrain_type]
|
||||
|
|
@ -858,8 +857,7 @@ Most units receive 20 to 40% defense in sand."
|
|||
editor_name= _ "Lit Mushroom Grove"
|
||||
string=^Ufi
|
||||
default_base=Uu
|
||||
aliasof=_bas,Uft
|
||||
mvt_alias=-,_bas,Uft
|
||||
aliasof=Uft
|
||||
light=25
|
||||
editor_group=cave
|
||||
[/terrain_type]
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
cost=52
|
||||
#extra resistance for these units
|
||||
usage=scout
|
||||
# wmllint: notecheck off
|
||||
description= _ "Cavaliers are masters at the use of both sword and crossbow from horseback. Their combination of striking power and mobility is fearsome; and they have a reputation for dash and aggressiveness to match it. The daring deeds of Cavaliers are the subject of many a tale and song."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DEFENSE_CAP}
|
||||
die_sound=horse-die.ogg
|
||||
[portrait]
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
cost=17
|
||||
usage=scout
|
||||
#extra resistance for these units
|
||||
# wmllint: notecheck off
|
||||
description= _ "Cavalrymen are distinguished from horsemen by their tactics and equipment. A cavalryman wears heavier armor, and carries a sword and shield, rather than a lance. Their tactics do not include charging; instead they maneuver to slash with a sword, using both horse and rider as an effective tool of melee.
|
||||
|
||||
Cavalrymen are very useful for taking and holding positions on open ground, for screening friendly soldiers, and also for scouting work."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DEFENSE_CAP}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
cost=34
|
||||
#extra resistance for these units
|
||||
usage=scout
|
||||
# wmllint: notecheck off
|
||||
description= _ "The more talented cavalrymen in the armies of Wesnoth are trained in the use of the crossbow, and matched with much more powerful steeds. Well-armored, and skilled in the use of their swords, these soldiers can drive forward and hold the ground they take. Their mobility and resilience make them of great value on the battlefield."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DEFENSE_CAP}
|
||||
die_sound=horse-die.ogg
|
||||
[portrait]
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
{AMLA_DEFAULT}
|
||||
cost=43
|
||||
usage=mixed fighter
|
||||
description= _ "."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_POISON}+{SPECIAL_NOTES_SKIRMISHER}
|
||||
description= _ "."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_POISON}
|
||||
die_sound={SOUND_LIST:ORC_DIE}
|
||||
[portrait]
|
||||
size=400
|
||||
|
|
|
|||
|
|
@ -78,8 +78,6 @@ Version 1.13.0-dev:
|
|||
* Fix unit move continuation if enemy discovered (#21372)
|
||||
* Support for total conversions, so called "cores".
|
||||
* Partial moves now able to be continued properly in whiteboard (#22231)
|
||||
* Mushroom Grove and Lit Mushroom Grove now favor the terrain with the worst
|
||||
movement costs between the base and overlay (bug #21971).
|
||||
* Fix bug wherein "lobby sounds" advanced preference didn't do anything for the default lobby.
|
||||
* Fix bug wherein dbus notifications did not have a wesnoth icon
|
||||
* Fix bug wherein chat history synopses weren't working right in the dbus notifications
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -490,6 +490,3 @@ msgstr "Joks"
|
|||
#: src/gui/dialogs/editor_set_starting_position.cpp:100
|
||||
msgid "Player $player_number"
|
||||
msgstr "Žaidėjas $player_number"
|
||||
|
||||
#~ msgid "ID"
|
||||
#~ msgstr "ID"
|
||||
|
|
|
|||
|
|
@ -3624,30 +3624,3 @@ msgstr ""
|
|||
#: data/campaigns/Eastern_Invasion/utils/final_battle.cfg:176
|
||||
msgid "I wasn’t able to prevent his escape from here. Now Wesnoth is doomed..."
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "You may now recruit young ogres!"
|
||||
#~ msgstr "Dabar galite samdyti žmogėdras!"
|
||||
|
||||
#~ msgid "Survive until end of turns"
|
||||
#~ msgstr "Išgyvenkite iki ėjimų pabaigos"
|
||||
|
||||
#~ msgid "Torture Chamber"
|
||||
#~ msgstr "Kankinimų kambarys"
|
||||
|
||||
#~ msgid "Throne Room"
|
||||
#~ msgstr "Sosto menė"
|
||||
|
||||
#~ msgid "The City"
|
||||
#~ msgstr "Miestas"
|
||||
|
||||
#~ msgid "Exit"
|
||||
#~ msgstr "Išėjimas"
|
||||
|
||||
#~ msgid "Well, where’s their leader? I don’t see him."
|
||||
#~ msgstr "Gerai, kur jų vadas? Aš jo nematau."
|
||||
|
||||
#~ msgid "Kill them!"
|
||||
#~ msgstr "Užmuškite juos!"
|
||||
|
||||
#~ msgid "I see the exit to the tunnel! Onward!"
|
||||
#~ msgstr "Aš matau išėjimą iš tunelio! Pirmyn!"
|
||||
|
|
|
|||
|
|
@ -5319,27 +5319,3 @@ msgstr "Lik sveikas. Tavo ištikima tarnyba nebus užmiršta."
|
|||
#: data/campaigns/Legend_of_Wesmere/utils/deaths.cfg:135
|
||||
msgid "Oh, no! We are too late..."
|
||||
msgstr "O, ne! Pavėlavome..."
|
||||
|
||||
#~ msgid "It’s Olurf! He made it!"
|
||||
#~ msgstr "Tai Olurfas! Jis atėjo!"
|
||||
|
||||
#~ msgid "Where do you want Olurf to deploy?"
|
||||
#~ msgstr "Kur norite matyti Olurfo pajėgas?"
|
||||
|
||||
#~ msgid "In the forested hills on the west bank of the river Telfar?"
|
||||
#~ msgstr "Miškingose kalvose vakariniame Telfaro upės krante?"
|
||||
|
||||
#~ msgid "Or on the east bank of the river in the Karmarth Hills?"
|
||||
#~ msgstr "Ar rytiniame krante Karmarto kalvose?"
|
||||
|
||||
#~ msgid "Choose the deployment of Olurf and his forces!"
|
||||
#~ msgstr "Parinkite vietą Olurfui ir jo vyrams!"
|
||||
|
||||
#~ msgid "Forested hills on the west bank of the river Telfar"
|
||||
#~ msgstr "Miškingos kalvos vakariniame Telfaro krante"
|
||||
|
||||
#~ msgid "The Karmarth Hills"
|
||||
#~ msgstr "Karmarto kalvos"
|
||||
|
||||
#~ msgid "Defeat enemy leaders"
|
||||
#~ msgstr "Nugalėkite priešo vadus"
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ msgstr ""
|
|||
#: ../../doc/man/wesnoth.6:54
|
||||
#, no-wrap
|
||||
msgid "B<--campaign-difficulty [E<lt>difficultyE<gt>]>"
|
||||
msgstr "B<--campaign-difficulty [E<lt>obtížnost<gt>]>"
|
||||
msgstr "B<--campaign-difficulty [E<lt>obtížnostE<gt>]>"
|
||||
|
||||
#. type: Plain text
|
||||
#: ../../doc/man/wesnoth.6:57
|
||||
|
|
@ -617,7 +617,7 @@ msgstr ""
|
|||
#: ../../doc/man/wesnoth.6:193
|
||||
#, no-wrap
|
||||
msgid "B<--username>I<E<lt>usernameE<gt>>"
|
||||
msgstr "B<--username>I<E<lt>jméno<gt>>"
|
||||
msgstr "B<--username>I<E<lt>jménoE<gt>>"
|
||||
|
||||
#. type: Plain text
|
||||
#: ../../doc/man/wesnoth.6:196
|
||||
|
|
@ -632,7 +632,7 @@ msgstr ""
|
|||
#: ../../doc/man/wesnoth.6:196
|
||||
#, no-wrap
|
||||
msgid "B<--password>I<E<lt>passwordE<gt>>"
|
||||
msgstr "B<--password>I<E<lt>heslo<gt>>"
|
||||
msgstr "B<--password>I<E<lt>hesloE<gt>>"
|
||||
|
||||
#. type: Plain text
|
||||
#: ../../doc/man/wesnoth.6:199
|
||||
|
|
|
|||
|
|
@ -2505,7 +2505,7 @@ msgstr ""
|
|||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><term>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1723
|
||||
msgid "Aged"
|
||||
msgstr ""
|
||||
msgstr "Pagyvenęs"
|
||||
|
||||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><listitem><simpara>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1727
|
||||
|
|
@ -2517,7 +2517,7 @@ msgstr ""
|
|||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><term>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1734
|
||||
msgid "Dim"
|
||||
msgstr ""
|
||||
msgstr "Bukas"
|
||||
|
||||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><listitem><simpara>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1738
|
||||
|
|
@ -2545,7 +2545,7 @@ msgstr ""
|
|||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><term>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1756
|
||||
msgid "Feral"
|
||||
msgstr ""
|
||||
msgstr "Laukinis"
|
||||
|
||||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><listitem><simpara>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1760
|
||||
|
|
@ -2632,7 +2632,7 @@ msgstr ""
|
|||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><term>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1821
|
||||
msgid "Weak"
|
||||
msgstr ""
|
||||
msgstr "Silpnas"
|
||||
|
||||
#. type: Content of: <book><chapter><section><section><variablelist><varlistentry><listitem><simpara>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:1825
|
||||
|
|
@ -3333,7 +3333,7 @@ msgstr ""
|
|||
#. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:2395
|
||||
msgid "Black"
|
||||
msgstr ""
|
||||
msgstr "Juodas"
|
||||
|
||||
# type: Content of: <book><chapter><section><section><simpara><inlinemediaobject>
|
||||
#. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry><inlinemediaobject>
|
||||
|
|
@ -3346,9 +3346,8 @@ msgstr ""
|
|||
# type: Content of: <book><chapter><section><section><variablelist><varlistentry><term>
|
||||
#. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry><inlinemediaobject><textobject><phrase>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:2402
|
||||
#, fuzzy
|
||||
msgid "Black orb"
|
||||
msgstr "Mėlynas rutulys"
|
||||
msgstr "Juodas rutulys"
|
||||
|
||||
#. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry>
|
||||
#: /src/wesnoth-master/doc/manual/manual.en.xml:2406
|
||||
|
|
@ -4350,10 +4349,3 @@ msgid ""
|
|||
msgstr ""
|
||||
"Patyrusių dalinių išlaikymas yra brangesnis, nei žemo lygio dalinių (1 "
|
||||
"auksas lygiui), ištikimi daliniai yra išimtis."
|
||||
|
||||
# type: Content of: <book><chapter><section><section><orderedlist><listitem><simpara>
|
||||
#~ msgid "Current hex position (x-coordinate, y-coordinate)"
|
||||
#~ msgstr "Dabartinio laukelio pozicija (x-koordinatė, y-koordinatė)"
|
||||
|
||||
#~ msgid "No orb"
|
||||
#~ msgstr "Nėra rutulio"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Battle for Wesnoth 1.11\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
|
||||
"POT-Creation-Date: 2014-01-04 20:07+0100\n"
|
||||
"POT-Creation-Date: 2014-03-02 18:56+0100\n"
|
||||
"PO-Revision-Date: 2010-01-01 00:00+0300\n"
|
||||
"Last-Translator: Andrius Štikonas <stikonas@gmail.com>\n"
|
||||
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
|
||||
|
|
@ -1842,6 +1842,7 @@ msgstr ""
|
|||
#. [multiplayer]: id=multiplayer_Random_YAMG_Map
|
||||
#: data/multiplayer/scenarios/Random_YAMG_Scenario.cfg:6
|
||||
#, fuzzy
|
||||
#| msgid "Random map"
|
||||
msgid "Random map by YAMG"
|
||||
msgstr "Atsitiktinis žemėlapis"
|
||||
|
||||
|
|
|
|||
|
|
@ -717,6 +717,7 @@ msgstr ""
|
|||
|
||||
#. [objective]: condition=win
|
||||
#: data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg:317
|
||||
#, fuzzy
|
||||
msgid "Move Kapou’e to the end of the mountains"
|
||||
msgstr "Nuveskite Kapou’e iki kalnų pabaigos"
|
||||
|
||||
|
|
@ -4120,6 +4121,3 @@ msgstr "Flar’Taras"
|
|||
#: data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg:99
|
||||
msgid "The Great Horde: upkeep cost of every unit decreased by one."
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "Yeah, sure."
|
||||
#~ msgstr "Taip žinoma."
|
||||
|
|
|
|||
|
|
@ -13486,8 +13486,8 @@ msgid ""
|
|||
"he stopped. He motioned us to be very quiet and we crept forward; all I "
|
||||
"could hear was the soft patter of feet and my heavy breathing. Even that "
|
||||
"little noise seemed to echo off the cramped walls of our rough-hewn passage. "
|
||||
"I was suddenly aware of the sheer mass of rock and earth above us and for "
|
||||
"a moment I despaired of ever seeing the sun again. Then I grabbed my sword "
|
||||
"I was suddenly aware of the sheer mass of rock and earth above us and for a "
|
||||
"moment I despaired of ever seeing the sun again. Then I grabbed my sword "
|
||||
"with fresh determination and vowed to see this mission through."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -790,7 +790,7 @@ msgstr ""
|
|||
#. [item]: id=buckler
|
||||
#: data/core/editor/items.cfg:159
|
||||
msgid "Buckler"
|
||||
msgstr ""
|
||||
msgstr "Skydas"
|
||||
|
||||
#. [item]: id=burial
|
||||
#: data/core/editor/items.cfg:165
|
||||
|
|
@ -890,7 +890,7 @@ msgstr "Raktas"
|
|||
#. [item]: id=leather-pack
|
||||
#: data/core/editor/items.cfg:291
|
||||
msgid "Leather Pack"
|
||||
msgstr ""
|
||||
msgstr "Odinis krepšys"
|
||||
|
||||
#. [item]: id=orcish-flag
|
||||
#: data/core/editor/items.cfg:297
|
||||
|
|
@ -962,7 +962,7 @@ msgstr "Baltas žiedas"
|
|||
#. [item]: id=scarecrow
|
||||
#: data/core/editor/items.cfg:381
|
||||
msgid "Scarecrow"
|
||||
msgstr ""
|
||||
msgstr "Kaliausė"
|
||||
|
||||
#. [item]: id=sceptre-of-fire
|
||||
#: data/core/editor/items.cfg:387
|
||||
|
|
@ -987,7 +987,7 @@ msgstr "Lazda"
|
|||
#. [item]: id=stone-tablet
|
||||
#: data/core/editor/items.cfg:411
|
||||
msgid "Stone Tablet"
|
||||
msgstr ""
|
||||
msgstr "Akmeninė lentelė"
|
||||
|
||||
#. [item]: id=storm-trident
|
||||
#. [object]
|
||||
|
|
@ -999,7 +999,7 @@ msgstr "Trišakis Audronaša"
|
|||
#. [item]: id=straw-bale2
|
||||
#: data/core/editor/items.cfg:423 data/core/editor/items.cfg:429
|
||||
msgid "Bale of Straw"
|
||||
msgstr ""
|
||||
msgstr "Šieno kupeta"
|
||||
|
||||
#. [item]: id=sword
|
||||
#: data/core/editor/items.cfg:435
|
||||
|
|
@ -3390,8 +3390,10 @@ msgstr ""
|
|||
|
||||
#. [theme]: id=UnitBox
|
||||
#: data/themes/unit_box.cfg:11
|
||||
#, fuzzy
|
||||
#| msgid "theme^Pandora"
|
||||
msgid "theme^UnitBox"
|
||||
msgstr ""
|
||||
msgstr "Pandora"
|
||||
|
||||
#. [theme]: id=UnitBox
|
||||
#: data/themes/unit_box.cfg:12
|
||||
|
|
@ -3406,7 +3408,7 @@ msgstr ""
|
|||
#. [theme]: id=Widescreen
|
||||
#: data/themes/widescreen.cfg:11
|
||||
msgid "theme^Widescreen"
|
||||
msgstr "Plačiaekranė"
|
||||
msgstr ""
|
||||
|
||||
#. [theme]: id=Widescreen
|
||||
#: data/themes/widescreen.cfg:12
|
||||
|
|
@ -3416,20 +3418,26 @@ msgstr ""
|
|||
#. [selected_unit_level]: id=selected-unit-level
|
||||
#. [unit_level]: id=unit-level
|
||||
#: data/themes/widescreen.cfg:493 data/themes/widescreen.cfg:619
|
||||
#, fuzzy
|
||||
#| msgid "statuspanel^lvl"
|
||||
msgid "statuspanel^level"
|
||||
msgstr "lygis"
|
||||
msgstr "lyg"
|
||||
|
||||
#. [selected_unit_moves]: id=selected-unit-moves
|
||||
#. [unit_moves]: id=unit-moves
|
||||
#: data/themes/widescreen.cfg:523 data/themes/widescreen.cfg:649
|
||||
#, fuzzy
|
||||
#| msgid "statuspanel^lvl"
|
||||
msgid "statuspanel^moves"
|
||||
msgstr "žingsniai"
|
||||
msgstr "lyg"
|
||||
|
||||
#. [selected_unit_defense]: id=selected-unit-defense
|
||||
#. [unit_defense]: id=unit-defense
|
||||
#: data/themes/widescreen.cfg:532 data/themes/widescreen.cfg:658
|
||||
#, fuzzy
|
||||
#| msgid "statuspanel^lvl"
|
||||
msgid "statuspanel^terrain def."
|
||||
msgstr "vietovės gyn."
|
||||
msgstr "lyg"
|
||||
|
||||
#. [tip]
|
||||
#: data/tips.cfg:4
|
||||
|
|
@ -5052,9 +5060,8 @@ msgid "The game map could not be loaded: "
|
|||
msgstr "Žaidimo žemėlapis negali būti įkeltas: "
|
||||
|
||||
#: src/game_display.cpp:949 src/game_display.cpp:975
|
||||
#, fuzzy
|
||||
msgid "Chat message"
|
||||
msgstr "Pokalbio žinučių senėjimas"
|
||||
msgstr "Pokalbio žinutė"
|
||||
|
||||
#: src/game_display.cpp:949 src/game_display.cpp:971
|
||||
#: src/playmp_controller.cpp:101
|
||||
|
|
@ -7965,12 +7972,3 @@ msgstr "Slėpti žaidėjo $player planus"
|
|||
#: src/whiteboard/manager.cpp:1114
|
||||
msgid "Whiteboard Options"
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "' (The game will now exit)"
|
||||
#~ msgstr "“ (Žaidimas dabar išsijungs)"
|
||||
|
||||
#~ msgid "ERROR DETAILS:"
|
||||
#~ msgstr "KLAIDOS DETALĖS:"
|
||||
|
||||
#~ msgid "$error, value '$value' at $pos"
|
||||
#~ msgstr "$error, reikšmė '$value', esanti $pos"
|
||||
|
|
|
|||
|
|
@ -421,11 +421,12 @@ void server::handle_request_campaign_list(const server::request& req)
|
|||
// Build a feedback_url string attribute from the
|
||||
// internal [feedback] data.
|
||||
const config& url_params = j.child_or_empty("feedback");
|
||||
j.clear_children("feedback");
|
||||
|
||||
if(!url_params.empty() && !feedback_url_format_.empty()) {
|
||||
j["feedback_url"] = format_addon_feedback_url(feedback_url_format_, url_params);
|
||||
}
|
||||
|
||||
// Clients don't need to see the original data, so discard it.
|
||||
j.clear_children("feedback");
|
||||
}
|
||||
|
||||
config response;
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ connect_engine::connect_engine(saved_game& state,
|
|||
team_name = "Team " +
|
||||
lexical_cast<std::string>(original_team_names.size());
|
||||
} else {
|
||||
team_name = lexical_cast<std::string>(
|
||||
team_name = "Team " + lexical_cast<std::string>(
|
||||
name_itor - original_team_names.begin() + 1);
|
||||
} // Note that the prefix "Team " is untranslatable, as team_name is not meant to be translated. This is needed so that the attribute
|
||||
// is not interpretted as an int when reading from config, which causes bugs later.
|
||||
|
|
|
|||
|
|
@ -854,6 +854,7 @@ int main(int argc, char** argv)
|
|||
} catch(std::bad_alloc&) {
|
||||
std::cerr << "Ran out of memory. Aborted.\n";
|
||||
return ENOMEM;
|
||||
#if !defined(NO_CATCH_AT_GAME_END)
|
||||
} catch(std::exception & e) {
|
||||
// Try to catch unexpected exceptions.
|
||||
std::cerr << "Caught general exception:\n" << e.what() << std::endl;
|
||||
|
|
@ -864,7 +865,6 @@ int main(int argc, char** argv)
|
|||
} catch(const char * e) {
|
||||
std::cerr << "Caught a string thrown as an exception:\n" << e << std::endl;
|
||||
return 1;
|
||||
#if !defined(NO_CATCH_AT_GAME_END)
|
||||
} catch(...) {
|
||||
// Ensure that even when we terminate with `throw 42`, the exception
|
||||
// is caught and all destructors are actually called. (Apparently,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue