Corrections on usage of _ "" function (toavoidMacro variable in it)

add first version of fr.po

macros/abilities.cfg

@@ -685,4 +685,4 @@ Enemy units cannot see this unit while it is in water, except if they have units
 			[/or]
 		[/filter_opponent]
 	[/damage]
-#enddef
+#enddef

macros/ability_events.cfg

@@ -396,4 +396,4 @@
 			{COLOR_HEAL}
 		[/unstore_unit]
 	[/event]
-#enddef
+#enddef

macros/buildings.cfg

@@ -111,8 +111,8 @@ first_time_only=no
 				[option]
 					image=icons/dice.png
 					label=5g
-					description= _"<span color='red'>Play Dice</span>
-If you roll highest you win 10g"
+					description= "<span color='red'>" + _"Play Dice" + "</span>
+" + _ "If you roll highest you win 10g"
 					[show_if]
 						{CONDITION shopper.gold less_than 5}
 					[/show_if]
@@ -124,8 +124,8 @@ If you roll highest you win 10g"
 				[option]
 					image=icons/dice.png
 					label=5g
-					description= _"<span color='{TAM_BLUE}'>Play Dice</span>
-If you roll highest you win 10g"
+					description= "<span color='{TAM_BLUE}'>" + _"Play Dice" + "</span>
+" + _ "If you roll highest you win 10g"
 					[show_if]
 						{CONDITION shopper.gold greater_than_equal_to 5}
 					[/show_if]
@@ -454,8 +454,8 @@ first_time_only=no
 		[option]
 			image=icons/letter_and_ale.png
 			label=3g
-			description= _ "<span color='{TAM_BLUE}'>Drink Ale</span>
-Small chance of increasing max HP"
+			description= "<span color='{TAM_BLUE}'>" + _ "Drink Ale" + "</span>
+" + _ "Small chance of increasing max HP"
 			[show_if]
 				{CONDITION shopper.gold greater_than_equal_to 3}
 			[/show_if]
@@ -524,8 +524,8 @@ Small chance of increasing max HP"
 		[option]
 			image=icons/letter_and_ale.png
 			label=3g
-			description= _ "<span color='red'>Drink Ale</span>
-Small chance of increasing max HP"
+			description= "<span color='red'>" + _"Drink Ale" + "</span>
+" + _ "Small chance of increasing max HP"
 			[show_if]
 				{CONDITION shopper.gold less_than 3}
 			[/show_if]
@@ -540,8 +540,8 @@ Small chance of increasing max HP"
 		[option]
 			image=icons/letter_and_ale.png
 			label=8g
-			description= _ "<span color='{TAM_BLUE}'>Get Sloshed</span>
-Good chance of increasing max HP"
+			description= "<span color='{TAM_BLUE}'>" + _"Get Sloshed" + "</span>
+" + _ "Good chance of increasing max HP"
 			[show_if]
 				{CONDITION shopper.gold greater_than_equal_to 8}
 			[/show_if]
@@ -617,8 +617,8 @@ Good chance of increasing max HP"
 		[option]
 			image=icons/letter_and_ale.png
 			label=8g
-			description= _ "<span color='red'>Get Sloshed</span>
-Good chance of increasing max HP"
+			description= "<span color='red'>" + _"Get Sloshed" + "</span>
+" + _ "Good chance of increasing max HP"
 			[show_if]
 				{CONDITION shopper.gold less_than 8}
 			[/show_if]

macros/curses.cfg

@@ -34,7 +34,7 @@
 
 			# Pull the lever (machine is empty)
 			[option]
-				label= _"<span color='{TAM_BLUE}'>Pull the lever</span>"
+				label= "<span color='{TAM_BLUE}'>" + _ "Pull the lever" + "</span>"
 				[show_if]
 					[not]
 						[have_unit]
@@ -54,7 +54,7 @@
 
 			# Pull the lever (when the machine is occupied)
 			[option]
-				label= _"<span color='{TAM_BLUE}'>Pull the lever</span>"
+				label= "<span color='{TAM_BLUE}'>" + _ "Pull the lever" + "</span>"
 				[show_if]
 					[have_unit]
 						side=1,2
@@ -152,7 +152,7 @@ But who shall dare to claim the curse and bear this further trial?"
 
 			# Refuse
 			[option]
-				label= _"<span color='{TAM_BLUE}'>Refuse the curse</span>"
+				label= "<span color='{TAM_BLUE}'>" + _ "Refuse the curse" + "</span>"
 				[show_if]
 					[have_unit]
 						x,y=$x1,$y1
@@ -171,7 +171,7 @@ But who shall dare to claim the curse and bear this further trial?"
 
 			# Claim the curse
 			[option]
-				label= _"<span color='{TAM_BLUE}'>Claim the curse</span>"
+				label= "<span color='{TAM_BLUE}'>" + _ "Claim the curse" + "</span>"
 				[show_if]
 					[have_unit]
 						x,y=$x1,$y1
@@ -257,7 +257,7 @@ Yet find their feet now fail them when stood upon the land."
 
 			# Take
 			[option]
-				label= _"<span color='{TAM_BLUE}'>Uproot the statue and take it to the ship</span>"
+				label= "<span color='{TAM_BLUE}'>" + _ "Uproot the statue and take it to the ship" + "</span>"
 				[command]
 					[message]
 						speaker=unit

macros/figureheads.cfg

@@ -650,8 +650,8 @@
 				# Infantryman
 				[option]
 					image=scenery/figureheads/infantryman-statue.png
-					description= _"<span color='{TAM_BLUE}'>The Sturdy Sentinel</span>
-+10 blade/pierce resistance
+					description= "<span color='{TAM_BLUE}'>" + _"The Sturdy Sentinel" + "</span>
+" + _ "+10 blade/pierce resistance
 30% Bonus, 5% Blessing"
 					[show_if]
 						{CONDITION figurehead_infantryman equals yes}
@@ -667,8 +667,8 @@
 				# Skirmisher
 				[option]
 					image=scenery/figureheads/skirmisher-statue.png
-					description= _"<span color='{TAM_BLUE}'>Dahazi Dancer</span>
-Skirmisher ability
+					description= "<span color='{TAM_BLUE}'>" + _"Dahazi Dancer" + "</span>
+" + _ "Skirmisher ability
 35% Bonus, 5% Blessing"
 					[show_if]
 						{CONDITION figurehead_skirmisher equals yes}
@@ -684,8 +684,8 @@ Skirmisher ability
 				# Dragoon
 				[option]
 					image=scenery/figureheads/dragoon-statue.png
-					description= _"<span color='{TAM_BLUE}'>Renaldo's Rider</span>
-+2 max movement
+					description= "<span color='{TAM_BLUE}'>" + _"Renaldo's Rider" + "</span>
+" + _ "+2 max movement
 55% Bonus, 8% Blessing"
 					[show_if]
 						{CONDITION figurehead_dragoon equals yes}
@@ -701,8 +701,8 @@ Skirmisher ability
 				# Hoplite
 				[option]
 					image=scenery/figureheads/hoplite-statue.png
-					description= _"<span color='{TAM_BLUE}'>Shield of the Sea</span>
-Steadfast ability
+					description= "<span color='{TAM_BLUE}'>" + _"Shield of the Sea" + "</span>
+" + _ "Steadfast ability
 40% Bonus, 6% Blessing"
 					[show_if]
 						{CONDITION figurehead_hoplite equals yes}
@@ -718,8 +718,8 @@ Steadfast ability
 				# Lich
 				[option]
 					image=scenery/figureheads/lich-statue.png
-					description= _"<span color='{TAM_BLUE}'>Blinking Star</span>
-Melee drains
+					description= "<span color='{TAM_BLUE}'>" + _"Blinking Star" + "</span>
+" + _ "Melee drains
 20% Bonus, 3% Blessing"
 					[show_if]
 						{CONDITION figurehead_lich equals yes}
@@ -735,8 +735,8 @@ Melee drains
 				# Halberdier
 				[option]
 					image=scenery/figureheads/halberdier-statue.png
-					description= _"<span color='{TAM_BLUE}'>Champion of Bastille</span>
-+2 melee damage
+					description= "<span color='{TAM_BLUE}'>" + _"Champion of Bastille" + "</span>
+" + _ "+2 melee damage
 45% Bonus, 7% Blessing"
 					[show_if]
 						{CONDITION figurehead_halberdier equals yes}
@@ -752,8 +752,8 @@ Melee drains
 				# Enchantress
 				[option]
 					image=scenery/figureheads/enchantress-statue.png
-					description= _"<span color='{TAM_BLUE}'>Queen of Thantos</span>
-Magical ranged attack
+					description= "<span color='{TAM_BLUE}'>" + _"Queen of Thantos" + "</span>
+" + _ "Magical ranged attack
 30% Bonus, 4% Blessing"
 					[show_if]
 						{CONDITION figurehead_enchantress equals yes}
@@ -769,8 +769,8 @@ Magical ranged attack
 				# King
 				[option]
 					image=scenery/figureheads/king-statue.png
-					description= _"<span color='{TAM_BLUE}'>Tylon's Wrath</span>
-Leadership ability
+					description= "<span color='{TAM_BLUE}'>" + _"Tylon's Wrath" + "</span>
+" + _ "Leadership ability
 45% Bonus, 10% Blessing"
 					[show_if]
 						{CONDITION figurehead_king equals yes}
@@ -786,8 +786,8 @@ Leadership ability
 				# Naga
 				[option]
 					image=scenery/figureheads/naga-statue.png
-					description= _"<span color='{TAM_BLUE}'>Curse of the Naga</span>
-Naga movement costs and defence
+					description= "<span color='{TAM_BLUE}'>" + _"Curse of the Naga" + "</span>
+" + _ "Naga movement costs and defence
 50% Curse"
 					[show_if]
 						{CONDITION figurehead_naga equals yes}
@@ -803,4 +803,4 @@ Naga movement costs and defence
 			[/message]
 		[/command]
 	[/set_menu_item]
-#enddef
+#enddef

macros/help.cfg

@@ -15,7 +15,7 @@ label= _"Return To Game"
 
 [option]
 image=misc/reloaded.png
-label= _"<span color='{TAM_BLUE}'>Return To Help Menu</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Return To Help Menu" + "</span>"
 	[command]
 	[/command]
 [/option]
@@ -158,7 +158,7 @@ message= _ "
 # Cheat Mode
 [option]
 image=misc/help-icon.png
-label= _"<span color='{TAM_BLUE}'>Cheat Mode</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Cheat Mode" + "</span>"
 	[command]
 		{VARIABLE finished_help yes}
 		[message]
@@ -234,55 +234,55 @@ label= _"Return To Game"
 
 [option]
 image=themes/villages.png
-label= _"<span color='{TAM_BLUE}'>Villages and Gold</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Villages and Gold" + "</span>"
 [command]
 {TAM_HELP_VILLAGES_AND_GOLD}
 [/command]
 [/option]
 
 [option]
 image=themes/units.png
-label= _"<span color='{TAM_BLUE}'>Recruits and Recalls</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Recruits and Recalls" + "</span>"
 [command]
 {TAM_HELP_RECRUITS_AND_RECALLS}
 [/command]
 [/option]
 
 [option]
 image=themes/income.png
-label= _"<span color='{TAM_BLUE}'>Trading</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Trading" + "</span>"
 [command]
 {TAM_HELP_TRADING}
 [/command]
 [/option]
 
 [option]
 image=buttons/WML-custom.png
-label= _"<span color='{TAM_BLUE}'>Upgrades</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Upgrades" + "</span>"
 [command]
 {TAM_HELP_UPGRADES}
 [/command]
 [/option]
 
 [option]
 image=flags/flag-icon.png
-label= _"<span color='{TAM_BLUE}'>Ships and Sailing</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Ships and Sailing" + "</span>"
 [command]
 {TAM_HELP_SHIPS_AND_SAILING}
 [/command]
 [/option]
 
 [option]
 image=themes/sand-clock.png
-label= _"<span color='{TAM_BLUE}'>Global Turns</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Global Turns" + "</span>"
 [command]
 {TAM_HELP_GLOBAL_TURNS}
 [/command]
 [/option]
 
 [option]
 image=misc/ums.png
-label= _"<span color='{TAM_BLUE}'>Bugs and Settings</span>"
+label= "<span color='{TAM_BLUE}'>" + _ "Bugs and Settings" + "</span>"
 [command]
 {TAM_HELP_BUGS_AND_SETTINGS}
 [/command]