Merge branch 'master' into 2.4_Lite

Author: NovaRain

data/text/po/sv.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-08-12-09:57+0000\n"
-"PO-Revision-Date: 2025-12-21 09:52+0000\n"
+"PO-Revision-Date: 2026-01-02 22:52+0000\n"
 "Last-Translator: tygyh <jonis9898@hotmail.com>\n"
 "Language-Team: none\n"
 "Language: sv\n"
@@ -15103,44 +15103,55 @@ msgid ""
 " where we'll be safe from raiders, slavers, and such. So far he has the food and water systems up, but\n"
 " that's about it."
 msgstr ""
+"Så... Vi får inte prata om det, men eftersom jag behöver din hjälp... Valvet "
+"håller på att\n"
+" reparerat av Darion. Han är vår välgörare. När det är fullt fungerande, ska "
+"vi alla flytta in.\n"
+" där vi kommer att vara säkra från plundrare, slavhandlare och liknande. Än "
+"så länge har han mat- och vattensystemen uppe, men\n"
+" det är typ allt."
 
 #: dialog/bcrebecc.msg:169
 msgid "Me see. Need know more."
-msgstr ""
+msgstr "Förstår. Behöva veta mer."
 
 #: dialog/bcrebecc.msg:170
 msgid "I need to know more."
-msgstr ""
+msgstr "Jag behöver veta mer."
 
 #: dialog/bcrebecc.msg:171
 msgid ""
 "There's not much to say, really. Darion keeps to himself and never leaves the vault. If he has\n"
 " anything to say, he says it through Zeke. I've only met him once, and he seemed like a nice guy."
 msgstr ""
+"Det finns inte mycket att säga, egentligen. Darion håller sig för sig själv "
+"och lämnar aldrig valvet. Om han har\n"
+" något att säga, så säger han det genom Zeke. Jag har bara träffat honom en "
+"gång, och han verkade vara en trevlig kille."
 
 #: dialog/bcrebecc.msg:173
 msgid "Nice guys finish last. I wonder what he's up to?"
 msgstr ""
 
 #: dialog/bcrebecc.msg:175
 msgid "That's okay. You are very helpful."
-msgstr ""
+msgstr "Det är okej. Du är väldigt hjälpsam."
 
 #: dialog/bcrebecc.msg:176
 msgid "I have nothing to give you other than my undying gratitude."
-msgstr ""
+msgstr "Jag har inget annat att ge dig än min eviga tacksamhet."
 
 #: dialog/bcrebecc.msg:177
 msgid "That's more than enough. I'll help you."
-msgstr ""
+msgstr "Det är mer än tillräckligt. Jag tänker hjälpa dig."
 
 #: dialog/bcrebecc.msg:178
 msgid "It'll take more than that to buy my help."
-msgstr ""
+msgstr "Det krävs mer än så för att köpa min hjälp."
 
 #: dialog/bcrebecc.msg:179
 msgid "What the hell, I'll help you."
-msgstr ""
+msgstr "Vad fan, jag tänker hjälpa dig."
 
 #: dialog/bcrebecc.msg:180
 msgid ""
@@ -15155,15 +15166,15 @@ msgstr ""
 
 #: dialog/bcrebecc.msg:182
 msgid "You no worry, me find girl."
-msgstr ""
+msgstr "Du inte oroa, hittar flicka."
 
 #: dialog/bcrebecc.msg:183 dialog/ccquincy.msg:130
 msgid "Ooops."
 msgstr "Ojdå."
 
 #: dialog/bcrebecc.msg:184
 msgid "I'll try and stop them."
-msgstr ""
+msgstr "Jag ska försöka stoppa dem."
 
 #: dialog/bcrebecc.msg:185
 msgid "They won't stop me from finding your daughter."

data/text/swedish/dialog/bcrebecc.msg

@@ -81,29 +81,29 @@
  vaults lately.}
 {166}{}{Okay, me do.}
 {167}{}{All right, I will.}
-{168}{}{Well... we're not supposed to talk about it, but since I need your help... The vault is being
- repaired by Darion. He's our benefactor. When it's fully functional, we're all supposed to move in
- where we'll be safe from raiders, slavers, and such. So far he has the food and water systems up, but
- that's about it.}
-{169}{}{Me see. Need know more.}
-{170}{}{I need to know more.}
-{171}{}{There's not much to say, really. Darion keeps to himself and never leaves the vault. If he has
- anything to say, he says it through Zeke. I've only met him once, and he seemed like a nice guy.}
+{168}{}{Så... Vi får inte prata om det, men eftersom jag behöver din hjälp... Valvet håller på att
+ reparerat av Darion. Han är vår välgörare. När det är fullt fungerande, ska vi alla flytta in.
+ där vi kommer att vara säkra från plundrare, slavhandlare och liknande. Än så länge har han mat- och vattensystemen uppe, men
+ det är typ allt.}
+{169}{}{Förstår. Behöva veta mer.}
+{170}{}{Jag behöver veta mer.}
+{171}{}{Det finns inte mycket att säga, egentligen. Darion håller sig för sig själv och lämnar aldrig valvet. Om han har
+ något att säga, så säger han det genom Zeke. Jag har bara träffat honom en gång, och han verkade vara en trevlig kille.}
 {172}{}{Okej.}
 {173}{}{Nice guys finish last. I wonder what he's up to?}
 {174}{}{Jag förstår.}
-{175}{}{That's okay. You are very helpful.}
-{176}{}{I have nothing to give you other than my undying gratitude.}
-{177}{}{That's more than enough. I'll help you.}
-{178}{}{It'll take more than that to buy my help.}
-{179}{}{What the hell, I'll help you.}
+{175}{}{Det är okej. Du är väldigt hjälpsam.}
+{176}{}{Jag har inget annat att ge dig än min eviga tacksamhet.}
+{177}{}{Det är mer än tillräckligt. Jag tänker hjälpa dig.}
+{178}{}{Det krävs mer än så för att köpa min hjälp.}
+{179}{}{Vad fan, jag tänker hjälpa dig.}
 {180}{}{Thank you so much. I'll never be able to repay you for this. I'll wait here until you bring...
  Hey, there was someone outside listening to us! I saw their shadow on the tent wall. They just ran off
  that way! ::points north-east:: They must have heard everything!}
 {181}{}{Me stop, no get away!}
-{182}{}{You no worry, me find girl.}
+{182}{}{Du inte oroa, hittar flicka.}
 {183}{}{Ojdå.}
-{184}{}{I'll try and stop them.}
+{184}{}{Jag ska försöka stoppa dem.}
 {185}{}{They won't stop me from finding your daughter.}
 {186}{}{Oh well. Shit happens.}
 {187}{}{Please, just go away.}

scripts_src/brokhill/hcchad.ssl

@@ -506,7 +506,7 @@ procedure Node004 begin
    //if (global_var(GVAR_BH_CHAD) == CHAD_SUSPICIOUS) then
    if ( (global_var(GVAR_BH_CHAD) >= CHAD_SUSPICIOUS) and (global_var(GVAR_BH_CHAD) <= CHAD_CONFIRMED_GECKO) ) then //edit by killap (expansion pack)
       NOption(124,Node008,004);
-   if ( /*(global_var(GVAR_BH_CHAD) == CHAD_CONFIRMED) or (global_Var(GVAR_BH_CHAD) == CHAD_CONFIRMED_GECKO) or*/ (global_var(GVAR_BH_CHAD) == CHAD_CONFIRMED_BROKENHILLS) ) then begin
+   if ((global_var(GVAR_BH_CHAD) == CHAD_CONFIRMED_BROKENHILLS) ) then begin
       //NOption(125,Node009,004); // killap - expansion pack
       NOption(126,Node022,004); //was 009 - killap - expansion pack
    end

scripts_src/ncr/scslvgrd.ssl

@@ -165,7 +165,7 @@ procedure critter_p_proc begin
    if (map_var(MVAR_Slavers_Attack) == 1) then begin
       set_local_var(LVAR_Hostile, 2);
    end else begin
-      if (/*onPatrol and */seep) then begin
+      if (seep) then begin
          if (tile_in_tile_rect(13725, 12485, 19125, 19085, dude_tile)) then begin
             set_map_var(MVAR_Slavers_Attack, 1);
          end

scripts_src/newreno/ncrenesc.ssl

@@ -822,10 +822,10 @@ procedure Node042 begin
    end else if (get_glasses == glasses_freebie) then begin
       NOption(244, Node066, 004);
    end
-   // There is no point to check for knowing him since his mouse over says his name.
+   // There is no point to check "know_renesco" since his mouseover says his name.
    // Plus, depending upon what dialogue tree you go through when first meeting him, you might not ever set this variable
    // Could be fixed by tweaking the dialogue so that he always ends up introducing himself, but it is not worth it. -killap
-   if (/*(know_renesco) and  */  ((mine_reward_cash) or (mine_reward_free)) and (gave_mine_tool == false)) then begin
+   if (((mine_reward_cash) or (mine_reward_free)) and (gave_mine_tool == false)) then begin
       NOption(710, Node990, 004);
    end
    NOption(711, Node036, 008);

scripts_src/sanfran/fccrocke.ssl

@@ -211,7 +211,7 @@ procedure talk_p_proc begin
          gSay_End;
          end_dialogue;
       end
-   end else if (/*armor_flag(ARMOR_SOLDFUELTANKER) or */armor_flag(ARMOR_SOLDMONEY)) then begin //killap's fix: commented out since this is the tanker variable and in addition, the elron variable is not needed since the fuel was requested for the spaceship and not Crocke (why would he get mad then?)
+   end else if (armor_flag(ARMOR_SOLDMONEY)) then begin  // killap's fix: commented out armor_flag(ARMOR_SOLDFUELTANKER) since this is the tanker variable and in addition, the elron variable is not needed since the fuel was requested for the spaceship and not Crocke (why would he get mad then?)
       start_gdialog(NAME,self_obj,4,-1,-1);
       gSay_Start;
          call Node021;

scripts_src/sanfran/fcronmey.ssl

@@ -191,7 +191,7 @@ procedure talk_p_proc begin
 
    if (san_fran_flag(SF_PUNKS_ENEMY)) then begin
       call Node014;
-   end else if ( /*(not good_critter_reaction) and */(not local_var(LVAR_Girl_Reaction)) and (not local_var(LVAR_Spleen_Reaction))) then begin
+   end else if ((not good_critter_reaction) and (not local_var(LVAR_Girl_Reaction)) and (not local_var(LVAR_Spleen_Reaction))) then begin
       call Node001;
    end else begin
       start_gdialog(NAME,self_obj,4,-1,-1);