Skip to content

Commit fff8530

Browse files
committed
Merge branch 'master' into 2.4_Lite
2 parents a45f6d1 + 2246494 commit fff8530

File tree

14 files changed

+59
-38
lines changed

14 files changed

+59
-38
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
pull_request:
66

77
env:
8-
sfall_version: 4.4.8
9-
mpack_version: 4.4.8
8+
sfall_version: 4.4.9
9+
mpack_version: 4.4.9
1010

1111
jobs:
1212
build:

data/text/po/sv.po

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ msgstr ""
44
"Project-Id-Version: PACKAGE VERSION\n"
55
"Report-Msgid-Bugs-To: \n"
66
"POT-Creation-Date: 2026-01-29-07:54+0000\n"
7-
"PO-Revision-Date: 2026-01-17 20:52+0000\n"
8-
"Last-Translator: tygyh <jonis9898@hotmail.com>\n"
7+
"PO-Revision-Date: 2026-02-09 16:52+0000\n"
8+
"Last-Translator: cocainecookie859-cpu <cocainecookie859@gmail.com>\n"
99
"Language-Team: none\n"
1010
"Language: sv\n"
1111
"MIME-Version: 1.0\n"
@@ -4713,6 +4713,9 @@ msgid ""
47134713
"You can find Bill, our resident trader, in the building across from here. Other than that, you ought to go\n"
47144714
" to Percy's Survival Gear Locker at the Junkyard in Gecko or Happy Harry's in the Courtyard at Vault City."
47154715
msgstr ""
4716+
"Du kan hitta Bill, vår lokala köpman, i byggnaden mittemot här. Annars bör "
4717+
"du gå till Percy's Överlevnadsredskåp\n"
4718+
" i skrotgården i Gecko eller Glada Harry's I gården i Valvstaden."
47164719

47174720
#: dialog/abguard.msg:401
47184721
msgid "Good to know. I have another question."
@@ -5240,6 +5243,11 @@ msgid ""
52405243
" I don't find this device in time. Your people, on the other hand, seem to live a peaceful life without much need for so\n"
52415244
" much healing equipment. I'm not asking for a lot, even the smallest amount you could give me would help me greatly."
52425245
msgstr ""
5246+
"Eftersom jag är på ett heligt äventyr efter ett Garden Of Eden Creation Kit. "
5247+
"\n"
5248+
"Hela min by kommer gå under om jag inte hittar denna apparat, förstår du, "
5249+
"men ert folk verkar leva fredfullt utan så mycket läkemedel. \n"
5250+
"Jag ber inte om mycket, bara en liten mängd skulle hjälpa ytterst mycket."
52435251

52445252
#: dialog/abhealer.msg:706
52455253
msgid ""
@@ -7095,62 +7103,77 @@ msgid ""
70957103
"He lives in New Reno now, preachin' the good word, er, something like that. "
70967104
"You know, you two seem a lot alike."
70977105
msgstr ""
7106+
"Han bor i Nya Reno nu, predikar det goda ordet eller nåt sånt. Ni är ganska "
7107+
"lika ni två, faktiskt."
70987108

70997109
#: dialog/absamuel.msg:206
71007110
msgid ""
71017111
"New Reno, huh? [He leans on his shovel, pulls out a small flask and takes a big swig.] I 'member him sayin he'd\n"
71027112
" *hickup* be headin that way. I'm glad he made it there safely. I always *hickup* liked that fella. A real hoot. If you\n"
71037113
" see him again, tell him Ol' Sammy is still alive an' kickin."
71047114
msgstr ""
7115+
"Nya Reno, va? [han lutar över sin spade, tar fram en liten flaska och tar en "
7116+
"klunk.] Ja' minns när han sa han *hick* skulle ditåt. Bra att han kom dit "
7117+
"säkert. Jag har alltid *hick* gillat den gubben. Möts ni igen kan du säga "
7118+
"att gamle Sammy fortfarande är vid livs levande."
71057119

71067120
#: dialog/absamuel.msg:207
71077121
msgid "I'll do that. I got some other questions though."
7108-
msgstr ""
7122+
msgstr "Det ska jag. Jag har några fler frågor."
71097123

71107124
#: dialog/absamuel.msg:208
71117125
msgid "I'll do that. Take care Sam."
7112-
msgstr ""
7126+
msgstr "Det ska jag. Ha det bra Sam."
71137127

71147128
#: dialog/absamuel.msg:209 dialog/abtom.msg:206 dialog/icscout.msg:407
71157129
#: dialog/nckeiwri.msg:264 dialog/ncliljes.msg:530 dialog/ncmcgee.msg:410
71167130
#: dialog/ncresear.msg:282 dialog/vcsupgrd.msg:173
71177131
msgid "Nevermind. Sorry to bother you."
7118-
msgstr ""
7132+
msgstr "Strunt i det. Förlåt att jag stör."
71197133

71207134
#: dialog/absamuel.msg:210
71217135
msgid ""
71227136
"Actually I was just going to say that he sends his greetings. I'll be sure "
71237137
"to tell him you say hello as well. I got some other questions though."
71247138
msgstr ""
7139+
"Jag skulle just säga att han hälsar. Jag ska nämna att du säger hej också. "
7140+
"Jag har några fler frågor."
71257141

71267142
#: dialog/absamuel.msg:211
71277143
msgid ""
71287144
"Actually I was just going to say that he sends his greetings. I'll be sure "
71297145
"to tell him you say hello as well. Take care Sam."
71307146
msgstr ""
7147+
"Jag skulle just säga att han hälsar. Jag ska nämna att du säger hej också. "
7148+
"Ha det bra Sam."
71317149

71327150
#: dialog/absamuel.msg:300
71337151
msgid "What do you *hickup* wanna know?"
7134-
msgstr ""
7152+
msgstr "Vad vill du *hick* veta?"
71357153

71367154
#: dialog/absamuel.msg:301
71377155
msgid "Are you the gravekeeper?"
7138-
msgstr ""
7156+
msgstr "Är du gravvakt?"
71397157

71407158
#: dialog/absamuel.msg:303 dialog/gcskeetr.msg:263
71417159
msgid "Anything I can help you with?"
7142-
msgstr ""
7160+
msgstr "Någonting jag kan hjälpa dig med?"
71437161

71447162
#: dialog/absamuel.msg:400
71457163
msgid ""
71467164
"Yes, *hickup* I tend to these 'ere graves. Nobody else wants to *hickup* do it, so Ol' Sammy got th' job. It's\n"
71477165
" not as bad as one might think. It's got its... perks, if you know what I mean. [He grins sloppily and wiggles his bushy\n"
71487166
" eyebrows at you.]"
71497167
msgstr ""
7168+
"Ja, *hick* jag ta' hand om grava'na här. Ingen annan vill *hick* gör' det, "
7169+
"så gamle Sammy fick jobbet. Det e' inte så \n"
7170+
" illa som du kan tro. Det har... fö'måner, om du fattar vad jag mena'. [Han "
7171+
"flinar och vinkar sina buskiga\n"
7172+
" ögonbryn mot dig.]"
71507173

71517174
#: dialog/absamuel.msg:401
71527175
msgid "No. I don't know what you mean, and I never want to. Bye."
7153-
msgstr ""
7176+
msgstr "Nej. Jag vet inte vad du menar, och jag vill aldrig göra det. Hej då."
71547177

71557178
#: dialog/absamuel.msg:402
71567179
msgid ""

data/text/swedish/dialog/abguard.msg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
{303}{}{Det är ett trevligt arrangemang. Låt mig fråga dig något annat.}
2222
{304}{}{Visst, adjö.}
2323
{305}{}{Tror du att du kan håller koll på mig? Låt oss se dig försöka, gamle man. Det här ska bli kul.}
24-
{400}{}{You can find Bill, our resident trader, in the building across from here. Other than that, you ought to go
25-
to Percy's Survival Gear Locker at the Junkyard in Gecko or Happy Harry's in the Courtyard at Vault City.}
24+
{400}{}{Du kan hitta Bill, vår lokala köpman, i byggnaden mittemot här. Annars bör du gå till Percy's Överlevnadsredskåp
25+
i skrotgården i Gecko eller Glada Harry's I gården i Valvstaden.}
2626
{401}{}{Bra att veta. Jag har en annan fråga.}
2727
{402}{}{Tack, hej då.}
2828
{500}{}{Om någon är fattig eller girig nog att försöka gräva upp gravar, så är det deras ensak. Det är inte som att de döda kan

data/text/swedish/dialog/abhealer.msg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
{702}{}{Tror du att du kan ge mig lite av dina mediciner? Du verkar ha mer än du använder.}
3030
{703}{}{Vill du att jag bara ska *ge* dem till dig? Vad får dig att tro att du förtjänar dem mer än folket i Klostret?}
3131
{704}{}{För att jag brukar bli skadad... ofta.}
32-
{705}{}{Because I'm on a holy quest to find a Garden Of Eden Creation Kit. You see, my entire village will perish if
33-
I don't find this device in time. Your people, on the other hand, seem to live a peaceful life without much need for so
34-
much healing equipment. I'm not asking for a lot, even the smallest amount you could give me would help me greatly.}
32+
{705}{}{Eftersom jag är på ett heligt äventyr efter ett Garden Of Eden Creation Kit.
33+
Hela min by kommer gå under om jag inte hittar denna apparat, förstår du, men ert folk verkar leva fredfullt utan så mycket läkemedel.
34+
Jag ber inte om mycket, bara en liten mängd skulle hjälpa ytterst mycket.}
3535
{706}{}{[Han funderar över dina ord ett ögonblick och nickar sedan.] Okej, jag ska ge dig lite av vår överblivna medicinska utrustning.
3636
Det låter som om du kommer att behöva dem. Här. [Han ger dem till dig.] Lycka till, vandrare.}
3737
{707}{}{Tack, Jack. Du har räddat mig från ödemarkens faror. Adjö.}

data/text/swedish/dialog/absamuel.msg

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@
88
{204}{}{Father Tully, you say? [He appears to be racking his brain trying to remember.] Yeah... I *hickup* 'member Tully.
99
How's that fella doin anyway? I 'aven't seen him since he was kicked out of 'ere long time *hiccup* long time ago.
1010
[He grins drunkenly as he reflects.] Boy he was a hoot. Him and me together, *hickup* what a combo.}
11-
{205}{}{He lives in New Reno now, preachin' the good word, er, something like that. You know, you two seem a lot alike.}
12-
{206}{}{New Reno, huh? [He leans on his shovel, pulls out a small flask and takes a big swig.] I 'member him sayin he'd
13-
*hickup* be headin that way. I'm glad he made it there safely. I always *hickup* liked that fella. A real hoot. If you
14-
see him again, tell him Ol' Sammy is still alive an' kickin.}
15-
{207}{}{I'll do that. I got some other questions though.}
16-
{208}{}{I'll do that. Take care Sam.}
17-
{209}{}{Nevermind. Sorry to bother you.}
18-
{210}{}{Actually I was just going to say that he sends his greetings. I'll be sure to tell him you say hello as well. I got some other questions though.}
19-
{211}{}{Actually I was just going to say that he sends his greetings. I'll be sure to tell him you say hello as well. Take care Sam.}
20-
{300}{}{What do you *hickup* wanna know?}
21-
{301}{}{Are you the gravekeeper?}
11+
{205}{}{Han bor i Nya Reno nu, predikar det goda ordet eller nåt sånt. Ni är ganska lika ni två, faktiskt.}
12+
{206}{}{Nya Reno, va? [han lutar över sin spade, tar fram en liten flaska och tar en klunk.] Ja' minns när han sa han *hick* skulle ditåt. Bra att han kom dit säkert. Jag har alltid *hick* gillat den gubben. Möts ni igen kan du säga att gamle Sammy fortfarande är vid livs levande.}
13+
{207}{}{Det ska jag. Jag har några fler frågor.}
14+
{208}{}{Det ska jag. Ha det bra Sam.}
15+
{209}{}{Strunt i det. Förlåt att jag stör.}
16+
{210}{}{Jag skulle just säga att han hälsar. Jag ska nämna att du säger hej också. Jag har några fler frågor.}
17+
{211}{}{Jag skulle just säga att han hälsar. Jag ska nämna att du säger hej också. Ha det bra Sam.}
18+
{300}{}{Vad vill du *hick* veta?}
19+
{301}{}{Är du gravvakt?}
2220
{302}{}{Vad kan du berätta om Klostret?}
23-
{303}{}{Anything I can help you with?}
21+
{303}{}{Någonting jag kan hjälpa dig med?}
2422
{400}{}{Yes, *hickup* I tend to these 'ere graves. Nobody else wants to *hickup* do it, so Ol' Sammy got th' job. It's
2523
not as bad as one might think. It's got its... perks, if you know what I mean. [He grins sloppily and wiggles his bushy
2624
eyebrows at you.]}

data/text/swedish/dialog/abtom.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{203}{}{Inte när han smyger runt som en tjuv och bär på en spade.}
1010
{204}{}{Okej, visst, men varför bär du runt på en spade?}
1111
{205}{}{Hur som helst, jag ska vidare.}
12-
{206}{}{Nevermind. Sorry to bother you.}
12+
{206}{}{Strunt i det. Förlåt att jag stör.}
1313
{207}{}{You mean this ol' thing? [He glances down at the rusty shovel in his hands.] Well, uh, you never know when you
1414
might find something that needs digging up. Always be prepared I say.}
1515
{208}{}{Find something, eh? You mean like something in a grave?}

data/text/swedish/dialog/gcskeetr.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
mostly. Make 'em work better... sometimes. Keepin' myself outta trouble. Know what I mean?}
7474
{261}{}{I guess. Let me ask you something else.}
7575
{262}{}{Well, I think I better go do something myself. Goodbye.}
76-
{263}{}{Anything I can help you with?}
76+
{263}{}{Någonting jag kan hjälpa dig med?}
7777
{270}{}{You're lookin' fer a GECK, huh? Well, I don't rightly know where ya might find one of them thar
7878
things. I know that Vault City prolly used ta have themselves one.}
7979
{271}{}{Vault City had one?}

data/text/swedish/dialog/icscout.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{404}{}{My name is not important. I have come to warn you. You are in great danger!}
1313
{405}{}{I am your nemesis. Prepare to join your ancestors!}
1414
{406}{}{I'm French. Why do you think I have this outrageous accent? [Stare at him oddly.]}
15-
{407}{}{Nevermind. Sorry to bother you.}
15+
{407}{}{Strunt i det. Förlåt att jag stör.}
1616
{410}{}{You speak to Shadow Who Walks. Why have you come here?}
1717
{411}{}{I'm trying to stop raider attacks on Vault City, and I have reason to believe that this is the raiders' base of operations. What do you know about the raiders?}
1818
{412}{}{I was sent by Vault City on account of Raiders attacking them.}

data/text/swedish/dialog/nckeiwri.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{259}{}{I'm looking for a job. Chris sent me by. Is Family Wright hiring?}
2020
{262}{}{Hey, Keith. I ran into your Mom.}
2121
{263}{}{Can you tell me about your brother Richard?}
22-
{264}{}{Nevermind. Sorry to bother you.}
22+
{264}{}{Strunt i det. Förlåt att jag stör.}
2323
{280}{}{Get outta here, dimbulb. Next time you talk to me, I'll plug you fulla holes.}
2424
{281}{}{Holes holes holes in my soles}
2525
{282}{}{Shamma Lamma DING DONG}

data/text/swedish/dialog/ncliljes.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
{525}{}{Ay-me-go?}
101101
{526}{}{Cheee-ka Cheeek-aaaah}
102102
{529}{}{I had some questions...}
103-
{530}{}{Nevermind. Sorry to bother you.}
103+
{530}{}{Strunt i det. Förlåt att jag stör.}
104104
{540}{}{}
105105
{541}{}{}
106106
{542}{}{Hey, hey, hey! You're }

0 commit comments

Comments
 (0)