Merge branch 'qspadditions' into additional_translation_fixes

main.py

@@ -225,6 +225,7 @@ def translate(text, data_type, uncertain=False):
                 translation = '$' + translation
             elif text[0] != '$' and translation[0] == '$':
                 translation = translation[1:]
+            translation.replace("-", "_")
 
         if uncertain:
             if translation not in _uncertainties_:

translated/matsumoto_event.qsrc

@@ -728,9 +728,9 @@ End
 if $args[0]="sit_down_and_chat":
           a=0 
           q=0
-          sb-1=rand(1,2)
-          if sb-1=1:$sb_question='Yuki Nagase (good girl)'
-          if sb-1=2:$sb_question='Satsuki Ena (Stupid Secretary)'
+          sb_1=rand(1,2)
+          if sb_1=1:$sb_question='Yuki Nagase (good girl)'
+          if sb_1=2:$sb_question='Satsuki Ena (Stupid Secretary)'
           if $matsumoto_event_chain=7:$matsumoto_event_chain=8
         '<div class="show_menu">'
              '<video preload="metadata" autoplay loop height="480">

translated/throw_points_in_the_ring.qsrc

@@ -29,7 +29,7 @@ gs'throw_point_details'
 		'<div class="action">
 			<a class="photo"><img class="img_stretch" src="images\videos\fighter\pics\男人1.jpg"></a>
 			<a class="photo"><img class="img_stretch" src="images\videos\fighter\pics\<<$dice_color>><<$i_throw_points>>.jpg"></a>'
-			if $lead-filled_dice>0:'<a class="photo" data-title="Lead-filled dice x<<$lead-filled_dice>>" href="exec:$lead-filled_dice-=1 & lead_filling_dice_activation=1 & gt ''throw_points_in_the_ring''"><img class="img_stretch" src="images\videos\fighter\pics\N8.jpg"></a>'
+			if $lead_filled_dice>0:'<a class="photo" data-title="Lead-filled dice x<<$lead_filled_dice>>" href="exec:$lead_filled_dice-=1 & lead_filling_dice_activation=1 & gt ''throw_points_in_the_ring''"><img class="img_stretch" src="images\videos\fighter\pics\N8.jpg"></a>'
 		'</div>'
 
 		'<div class="action">'

translated/trophy_referee.qsrc

@@ -28,7 +28,7 @@ gs'menu_gif'
 			if $number_of_trophies>=6:'<a class="photo" data-title="Critical strike chance 1% (x6" href="exec:$number_of_trophies-=6 & $initial_critical_strike_in_the_ring+=1 & gt ''trophy_referee''"><img class="img_stretch" src="images\videos\fighter\pics\暴加.jpg"></a>'else:'<a class="photo" data-title="Critical strike chance 1% (x6" ><img class="img_stretch" src="images\videos\fighter\pics\暴加.jpg"></a>'
 		'</div>'
 		'<div class="action">'
-			if $number_of_trophies>=8*$lead-filled_dice:'<a class="photo" data-title="Lead-filled dice♟x<<8*$lead-filled_dice>>" href="exec:$number_of_trophies-=8*$lead-filled_dice & $lead-filled_dice+=1 & gt ''trophy_referee''"><img class="img_stretch" src="images\videos\fighter\pics\N8.jpg"></a>'else:'<a class="photo" data-title="Lead-filled dice♟x<<8*$lead-filled_dice>>"><img class="img_stretch" src="images\videos\fighter\pics\N8.jpg"></a>'
+			if $number_of_trophies>=8*$lead_filled_dice:'<a class="photo" data-title="Lead-filled dice♟x<<8*$lead_filled_dice>>" href="exec:$number_of_trophies-=8*$lead_filled_dice & $lead_filled_dice+=1 & gt ''trophy_referee''"><img class="img_stretch" src="images\videos\fighter\pics\N8.jpg"></a>'else:'<a class="photo" data-title="Lead-filled dice♟x<<8*$lead_filled_dice>>"><img class="img_stretch" src="images\videos\fighter\pics\N8.jpg"></a>'
 		'</div>'
 		'<div class="action">'
 			if $number_of_trophies>=basic_cheer*2:'<a class="photo" data-title="+<<basic_cheer*2>>㊔♟x<<basic_cheer*2>> " href="exec:$number_of_trophies-=basic_cheer*2 & basic_cheer+=basic_cheer*2 & gt ''trophy_referee''"><img class="img_stretch" src="images\videos\fighter\pics\欢呼.jpg"></a>'else:'<a class="photo" data-title="More cheers㊔♟x<<basic_cheer*2>>"><img class="img_stretch" src="images\videos\fighter\pics\欢呼.jpg"></a>'

xml/variables.xml

@@ -979,7 +979,7 @@
 	<entry original="$擂台初始回盾" translated="$initial_return_to_the_shield_in_the_ring"/>
 	<entry original="$擂台初始闪避" translated="$initial_dodge_in_the_ring"/>
 	<entry original="$擂台初始暴击" translated="$initial_critical_strike_in_the_ring"/>
-	<entry original="$灌铅骰子" translated="$lead-filled_dice"/>
+	<entry original="$灌铅骰子" translated="$lead_filled_dice"/>
 	<entry original="战利品3" translated="loot_3"/>
 	<entry original="战利品4" translated="loot_4"/>
 	<entry original="战利品5" translated="loot_5"/>
@@ -1039,7 +1039,7 @@
 	<entry original="$SB关系" translated="$sb_relationship"/>
 	<entry original="$SB称呼" translated="$sb_name"/>
 	<entry original="$松本游乐场进度" translated="$matsumoto_playground_progress"/>
-	<entry original="SB随机数1" translated="sb-1"/>
+	<entry original="SB随机数1" translated="sb_1"/>
 	<entry original="$SB提问" translated="$sb_question"/>
 	<entry original="SB家补习数" translated="sb_home_tutoring_number"/>
 	<entry original="管理员初次进" translated="the_administrator_enters_for_the_first_time"/>