Hand-patch some Pango conversions that wmllint couldn't get right.

This commit is contained in:
Eric S. Raymond 2009-11-23 14:28:29 +00:00
parent 059daa4ecb
commit a1605bd14f
5 changed files with 44 additions and 36 deletions

View file

@ -19,7 +19,7 @@
" + _"(Novice level, 8 or 9 scenarios depending on the branch you take.)"
difficulties=EASY,NORMAL,HARD
difficulty_descriptions="*" + {MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Civilian" _"(Beginner)"} +
difficulty_descriptions={MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Civilian" _"(Beginner)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Recruit" _"(Easy)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/javelineer.png~RC(magenta>red)" _"Soldier" _"(Normal)"}

View file

@ -326,7 +326,7 @@
mode=append
[value]
message="*"+_"Back"
message="<span size='big'>"+_"Back" + "</span>"
[command]
[/command]
@ -476,7 +476,7 @@
mode=append
[value]
message="*"+_"Back"
message="<span size='big'>" + _"Back" + "</span>"
[command]
[/command]
@ -867,7 +867,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/insert_tag]
[option]
message="*"+_"Back"
message="<span size='big'>" + _"Back" + "</span>"
[command]
[/command]
@ -902,7 +902,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/insert_tag]
[option]
message="*"+_"Back"
message="<span size='big'>" + _"Back" + "</span>"
[command]
[/command]
@ -917,7 +917,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/insert_tag]
[literal]
message="*"+_"Exit"
message="<span size='big'>" + _"Exit" + "</span>"
[command]
{VARIABLE ai_controller_finished yes}

View file

@ -1,7 +1,7 @@
#textdomain wesnoth-anl
#define DONATE_FUNDS_OPTION TARGET_SIDE
[option]
message= "@$player_{TARGET_SIDE}.name" # wmllint: ignore
message= "<span color='green'>" + "$player_{TARGET_SIDE}.name" + "</span>" # wmllint: ignore no spellcheck
[show_if]
{CONDITION leader.gold greater_than_equal_to 20}
[have_unit]
@ -182,24 +182,25 @@
name=player_name
to_variable="player_$side_i|.name"
[/set_variable]
# FIXME: After 1.8, convert these to make player names green
[set_variable]
name=diplo_msg[$side_i].farming
# wmllint: markcheck off
value="@" + _ "$player_name
value=_ "$player_name
Share knowledge of agriculture"
# wmllint: markcheck on
[/set_variable]
[set_variable]
name=diplo_msg[$side_i].mining
# wmllint: markcheck off
value="@" + _ "$player_name
value=_ "$player_name
Share knowledge of mining"
# wmllint: markcheck on
[/set_variable]
[set_variable]
name=diplo_msg[$side_i].warfare
# wmllint: markcheck off
value="@" + _ "$player_name
value=_ "$player_name
Share knowledge of warfare"
# wmllint: markcheck on
[/set_variable]
@ -234,8 +235,9 @@ Share knowledge of warfare"
# Giving Money
# FIXME: After 1.8, pangoize these headings to green
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" ("@"+_"Donate Funds
message= {MENU_IMG_TXT "items/gold-coins-small.png" (_"Donate Funds
Give 20 gold to another player")}
[command]
{VARIABLE finished_suboptions no}
@ -267,8 +269,9 @@ Give 20 gold to another player")}
# Sharing Knowledge
# FIXME: After 1.8, pangoize these headings to green
[option]
message= {MENU_IMG_TXT "items/book4.png" ("@"+_"Share Knowledge
message= {MENU_IMG_TXT "items/book4.png" (_"Share Knowledge
Help an ally with their research")}
[command]
{VARIABLE finished_suboptions no}
@ -313,8 +316,9 @@ Help an ally with their research")}
# Dwarves
# FIXME: After 1.8, pangoize these headings to green
[option]
message= {MENU_IMG_TXT "units/dwarves/lord.png~TC(1,magenta)" ("@"+_"Negotiate with the Dwarves
message= {MENU_IMG_TXT "units/dwarves/lord.png~TC(1,magenta)" (_"Negotiate with the Dwarves
Lets you recruit a Dwarvish unit
Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$side_number|.leader_option_1.target")}
[show_if]
@ -339,8 +343,9 @@ Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$s
# Elves
# FIXME: After 1.8, pangoize these headings to green
[option]
message= {MENU_IMG_TXT "units/elves-wood/marshal.png~TC(1,magenta)" ("@"+_"Negotiate with the Elves
message= {MENU_IMG_TXT "units/elves-wood/marshal.png~TC(1,magenta)" (_"Negotiate with the Elves
Lets you recruit an Elvish unit
Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$side_number|.leader_option_2.target")}
[show_if]

View file

@ -111,8 +111,9 @@ Our mines produce $player_$side_number|.mining.gold|g
# wmlindent: stop ignoring
# Farming
# FIXME: After 1.8, pangoize so first line is green
[option]
message= {MENU_IMG_TXT "items/flower4.png" ("@"+_"Agriculture
message= {MENU_IMG_TXT "items/flower4.png" (_"Agriculture
Farmers produce +1 gold
Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.farming.target")}
[command]
@ -125,8 +126,9 @@ Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.fa
# Mining
# FIXME: After 1.8, pangoize so first line is green
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" ("@"+_"Mining
message= {MENU_IMG_TXT "items/gold-coins-small.png" (_"Mining
Miners produce +1 gold
Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.mining.target")}
[command]
@ -139,8 +141,9 @@ Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.min
#Warfare
# FIXME: After 1.8, pangoize so first line is green
[option]
message= {MENU_IMG_TXT "wesnoth-icon.png" ("@"+_"Warfare
message= {MENU_IMG_TXT "wesnoth-icon.png" (_"Warfare
Allows you to recruit a new type of unit
Study Progress: $player_$side_number|.warfare.progress|/$player_$side_number|.warfare.target")}
[show_if]

View file

@ -56,7 +56,7 @@ message= _ "Nothing"
# Convert to grassland
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Convert to Grassland") ("`"+_"Cost: 0g")}
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Convert to Grassland" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Re"}
[command]
{COMPLETE_ACTION 0}
@ -71,7 +71,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Convert to Grassland"
# Plant Farm
[option]
message= {MENU_IMG_TXT2 "terrain/flat/farm-veg-spring-icon.png" ("@"+_"Plant Farm") ("`"+_"Cost: 0g")}
message= {MENU_IMG_TXT2 "terrain/flat/farm-veg-spring-icon.png" ("<span color='green'>" + _"Plant Farm" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gg,Gs,Ggf"}
[command]
{COMPLETE_ACTION 0}
@ -83,7 +83,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/farm-veg-spring-icon.png" ("@"+_"Plant Far
# Build Village
[option]
message= {MENU_IMG_TXT2 "terrain/village/human-tile.png" ("@"+_"Build Village") ("`"+_"Cost: 15g")}
message= {MENU_IMG_TXT2 "terrain/village/human-tile.png" ("<span color='green'>" + _"Build Village" + "</span>") ("<span size='small'>" +_"Cost: 15g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gg,Gs,Ggf"}
[command]
[if]
@ -101,7 +101,7 @@ message= {MENU_IMG_TXT2 "terrain/village/human-tile.png" ("@"+_"Build Village")
# Build Castle
[option]
message= {MENU_IMG_TXT2 "terrain/castle/castle-tile.png" ("@"+_"Build Castle") ("`"+_"Cost: 6g")}
message= {MENU_IMG_TXT2 "terrain/castle/castle-tile.png" ("<span color='green'>" + _"Build Castle" + "</span>") ("<span size='small'>" +_"Cost: 6g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gg,Gs,Ggf"}
[command]
[if]
@ -118,7 +118,7 @@ message= {MENU_IMG_TXT2 "terrain/castle/castle-tile.png" ("@"+_"Build Castle") (
# Flood
[option]
message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("@"+_"Flood the Field") ("`"+_"Cost: 4g")}
message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("<span color='green'>" + _"Flood the Field" + "</span>") ("<span size='small'>" +_"Cost: 4g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gg,Gs,Ggf"}
[command]
[if]
@ -135,7 +135,7 @@ message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("@"+_"Flood the Field") ("`"+
# Plant Saplings
[option]
message= {MENU_IMG_TXT2 "terrain/forest/pine-tile.png" ("@"+_"Plant Saplings") ("`"+_"Cost: 1g")}
message= {MENU_IMG_TXT2 "terrain/forest/pine-tile.png" ("<span color='green'>" + _"Plant Saplings" + "</pan>") ("<span size='small'>" +_"Cost: 1g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gg,Gs,Ggf"}
[command]
[if]
@ -155,7 +155,7 @@ message= {MENU_IMG_TXT2 "terrain/forest/pine-tile.png" ("@"+_"Plant Saplings") (
# Chop Down Forest
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Chop Down Forest") ("`"+_"Earns: 1g")}
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Chop Down Forest" + "</span>") ("<span size='small'>" +_"Earns: 1g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gs^Fp,Gs^Ft,Aa^Fpa,Gg^Fet"}
[command]
{VARIABLE finished yes}
@ -182,7 +182,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Chop Down Forest") ("
# Build Gold Mine
[option]
message= {MENU_IMG_TXT2 "terrain/village/human-hills-tile.png" ("@"+_"Build Mine") ("`"+_"Cost: 25g")}
message= {MENU_IMG_TXT2 "terrain/village/human-hills-tile.png" ("<span color='green'>" + _"Build Mine" + "</span>") ("<span size='small'>" +_"Cost: 25g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Hh"}
[command]
[if]
@ -203,7 +203,7 @@ message= {MENU_IMG_TXT2 "terrain/village/human-hills-tile.png" ("@"+_"Build Mine
# Build Gold Mine
[option]
message= {MENU_IMG_TXT2 "terrain/village/human-mountain-tile.png" ("@"+_"Build Mine") ("`"+_"Cost: 25g")}
message= {MENU_IMG_TXT2 "terrain/village/human-mountain-tile.png" ("<span color='green'>" + _"Build Mine" + "</span>") ("<span size='small'>" +_"Cost: 25g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Mm"}
[command]
[if]
@ -224,7 +224,7 @@ message= {MENU_IMG_TXT2 "terrain/village/human-mountain-tile.png" ("@"+_"Build M
# Make a Ford
[option]
message= {MENU_IMG_TXT2 "terrain/water/ford.png" ("@"+_"Make a Ford") ("`"+_"Cost: 3g")}
message= {MENU_IMG_TXT2 "terrain/water/ford.png" ("<span color='green'>" + _"Make a Ford" + "</span>") ("<span size='small'>" +_"Cost: 3g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Ww"}
[command]
[if]
@ -242,7 +242,7 @@ message= {MENU_IMG_TXT2 "terrain/water/ford.png" ("@"+_"Make a Ford") ("`"+_"Cos
# Landfill
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Landfill") ("`"+_"Cost: 5g")}
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Landfill" + "</span>") ("<span size='small'>" +_"Cost: 5g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Ww"}
[command]
[if]
@ -263,7 +263,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Landfill") ("`"+_"Cos
# Destroy the Ford
[option]
message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("@"+_"Destroy the Ford") ("`"+_"Cost: 0g")}
message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("<span color='green'>" + _"Destroy the Ford" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Wwf"}
[command]
{COMPLETE_ACTION 0}
@ -278,7 +278,7 @@ message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("@"+_"Destroy the Ford") ("`"
# Landfill
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Landfill") ("`"+_"Cost: 1g")}
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Landfill" + "</span>") ("<span size='small'>" +_"Cost: 1g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Wwf"}
[command]
[if]
@ -299,7 +299,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Landfill") ("`"+_"Cos
# Break Up Cave
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Smash Cave Floor") ("`"+_"Cost: 2g")}
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Smash Cave Floor" + "</span>") ("<span size='small'>" +_"Cost: 2g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Uu,Uu^Ii"}
[command]
[if]
@ -316,7 +316,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Smash Cave Floor") ("
# Convert Cave To Hills
[option]
message= {MENU_IMG_TXT2 "terrain/hills-variation2.png" ("@"+_"Smash Cave Floor") ("`"+_"Cost: 3g")}
message= {MENU_IMG_TXT2 "terrain/hills-variation2.png" ("<span color='green'>" + _"Smash Cave Floor" + "</span>") ("<span size='small'>" +_"Cost: 3g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Uh,Uh^Ii"}
[command]
[if]
@ -333,7 +333,7 @@ message= {MENU_IMG_TXT2 "terrain/hills-variation2.png" ("@"+_"Smash Cave Floor")
# Harvest Cave Mushrooms
[option]
message= {MENU_IMG_TXT2 "terrain/cave/floor.png" ("@"+_"Harvest Mushrooms") ("`"+_"Earns: 3g")}
message= {MENU_IMG_TXT2 "terrain/cave/floor.png" ("<span color='green'>" + _"Harvest Mushrooms" + "</span>") ("<span size='small'>" +_"Earns: 3g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Uu^Uf"}
[command]
{VARIABLE finished yes}
@ -358,7 +358,7 @@ message= {MENU_IMG_TXT2 "terrain/cave/floor.png" ("@"+_"Harvest Mushrooms") ("`"
# Build Keep
[option]
message= {MENU_IMG_TXT2 "terrain/castle/keep-tile.png" ("@"+_"Build a Keep") ("`"+_"Cost: 6g")}
message= {MENU_IMG_TXT2 "terrain/castle/keep-tile.png" ("<span color='green'>" +_"Build a Keep" + "</span>") ("<span size='small'>" +_"Cost: 6g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Ch,Ce,Cv,Cud,Chr,Chw,Chs"}
[command]
[if]
@ -378,7 +378,7 @@ message= {MENU_IMG_TXT2 "terrain/castle/keep-tile.png" ("@"+_"Build a Keep") ("`
# Establish University
[option]
message= {MENU_IMG_TXT2 "terrain/village/elven-tile.png" ("@"+_"Establish University") ("`"+_"Cost: 7g")}
message= {MENU_IMG_TXT2 "terrain/village/elven-tile.png" ("<span color='green'>" + _"Establish University" + "</span>") ("<span size='small'>" +_"Cost: 7g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gg^Vh,Aa^Vha"}
[command]
[if]
@ -399,7 +399,7 @@ message= {MENU_IMG_TXT2 "terrain/village/elven-tile.png" ("@"+_"Establish Univer
# Clear Rubble
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("@"+_"Clear the Ground") ("`"+_"Cost: 0g")}
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Clear the Ground" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Rd"}
[command]
{COMPLETE_ACTION (-0)}