Skip to content

Commit 53b25bb

Browse files
committed
Merge branch 'master' into 2.4_Lite
2 parents 898aca5 + dce4b9d commit 53b25bb

File tree

27 files changed

+57
-57
lines changed

27 files changed

+57
-57
lines changed

data/text/english/dialog/fcdrshng.msg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@
158158

159159
{560}{}{Excellent. And what of Dr. Wong?}
160160
{561}{}{He is still alive. I'll return once he's out of the picture.}
161-
{562}{}{I'm not going to kill Dr. Sheng for you. I gave them the plant sample, and now I'm done helping you.}
161+
{562}{}{I'm not going to kill Dr. Wong for you. I gave them the plant sample, and now I'm done helping you.}
162162

163-
#from 240
163+
# from 240
164164
{570}{}{I need them put down, and you look more than capable of the task.}
165165
{571}{}{Why don't you send these, uh, more successful ones in there to take care of them?}
166166
{572}{}{Sounds fun. I'll do it.}

data/text/english/dialog/hcguard2.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{201}{}{I'm here to let you off duty early. I'm on the next guard shift.}
66
{202}{}{Ashton sent me to get you. He said he needed to check with you about the recent set of donations.}
77

8-
{210}{}{Awe, man -- Hey, wait a minute! I've never seen you around before. What are you doing here?}
8+
{210}{}{Oh, man -- Hey, wait a minute! I've never seen you around before. What are you doing here?}
99
{211}{}{I'm a new recruit. I was recently transferred here.}
1010
{212}{}{Yeah, I was assigned to kill you.}
1111

data/text/german/dialog/fcdrshng.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
{554}{}{Ich töte Dr. Wong auf keinen Fall für Sie. Ich bin hier fertig.}
120120
{560}{}{Gute Arbeit. Und was wird mit Dr. Wong?}
121121
{561}{}{Er ist immer noch am Leben. Ich werde zurückkehren, sobald er aus dem Weg geräumt ist.}
122-
{562}{}{Ich werde Dr. Sheng nicht für Sie töten. Ich gab ihm die Pflanzenprobe und jetzt bin ich fertig damit, Ihnen zu helfen.}
122+
{562}{}{Ich werde Dr. Wong nicht für Sie töten. Ich gab ihm die Pflanzenprobe und jetzt bin ich fertig damit, Ihnen zu helfen.}
123123
{570}{}{Sie müssen sie erledigen und Sie sehen mehr als fähig für die Aufgabe aus.}
124124
{571}{}{Warum schicken Sie nicht diese, ähm, erfolgreicheren Dinger, damit die sich darum kümmern?}
125125
{572}{}{Hört sich gut an, ich werd's machen.}

data/text/german/dialog/hcguard2.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{200}{}{(Sieht dich mit gelangweilten Augen an) Hey. Was treibt dich hier soweit runter?}
44
{201}{}{Ich bin hier um dich etwas früher abzulösen. Ich hab die nächste Wachschicht.}
55
{202}{}{Ashton schickt mich um dich zu holen. Er sagt, er muss mit dir die jüngsten Spenden durchsehen.}
6-
{210}{}{Toll, Mann - Hey, wart mal ne Sekunde! Ich hab dich noch nie zuvor gesehen. Was willst du hier?}
6+
{210}{}{Oh, Mann - Hey, wart mal ne Sekunde! Ich hab dich noch nie zuvor gesehen. Was willst du hier?}
77
{211}{}{Ich bin ein neuer Rekrut. Ich wurde erst vor kurzem hierher versetzt.}
88
{212}{}{Na, mir wurde aufgetragen dich zu töten.}
99
{220}{}{Scheiße. Ich hab keine Zeit für diesen Mist, meine Schicht ist fast zu Ende.}

data/text/hungarian/dialog/fcdrshng.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
{554}{}{There's no way I'm killing Dr. Wong for you. I'm done here.}
120120
{560}{}{Excellent. And what of Dr. Wong?}
121121
{561}{}{He is still alive. I'll return once he's out of the picture.}
122-
{562}{}{I'm not going to kill Dr. Sheng for you. I gave them the plant sample, and now I'm done helping you.}
122+
{562}{}{I'm not going to kill Dr. Wong for you. I gave them the plant sample, and now I'm done helping you.}
123123
{570}{}{I need them put down, and you look more than capable of the task.}
124124
{571}{}{Why don't you send these, uh, more successful ones in there to take care of them?}
125125
{572}{}{Sounds fun. I'll do it.}

data/text/hungarian/dialog/hcguard2.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{200}{}{(Looks at you with bored eyes) Hey. What brings you all the way down here?}
44
{201}{}{I'm here to let you off duty early. I'm on the next guard shift.}
55
{202}{}{Ashton sent me to get you. He said he needed to check with you about the recent set of donations.}
6-
{210}{}{Awe, man -- Hey, wait a minute! I've never seen you around before. What are you doing here?}
6+
{210}{}{Oh, man -- Hey, wait a minute! I've never seen you around before. What are you doing here?}
77
{211}{}{I'm a new recruit. I was recently transferred here.}
88
{212}{}{Yeah, I was assigned to kill you.}
99
{220}{}{Dammit. I don't have time for this crap, my shift's almost over.}

data/text/italian/dialog/fcdrshng.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
{554}{}{There's no way I'm killing Dr. Wong for you. I'm done here.}
120120
{560}{}{Excellent. And what of Dr. Wong?}
121121
{561}{}{He is still alive. I'll return once he's out of the picture.}
122-
{562}{}{I'm not going to kill Dr. Sheng for you. I gave them the plant sample, and now I'm done helping you.}
122+
{562}{}{I'm not going to kill Dr. Wong for you. I gave them the plant sample, and now I'm done helping you.}
123123
{570}{}{I need them put down, and you look more than capable of the task.}
124124
{571}{}{Why don't you send these, uh, more successful ones in there to take care of them?}
125125
{572}{}{Sounds fun. I'll do it.}

data/text/italian/dialog/hcguard2.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{200}{}{(Looks at you with bored eyes) Hey. What brings you all the way down here?}
44
{201}{}{I'm here to let you off duty early. I'm on the next guard shift.}
55
{202}{}{Ashton sent me to get you. He said he needed to check with you about the recent set of donations.}
6-
{210}{}{Awe, man -- Hey, wait a minute! I've never seen you around before. What are you doing here?}
6+
{210}{}{Oh, man -- Hey, wait a minute! I've never seen you around before. What are you doing here?}
77
{211}{}{I'm a new recruit. I was recently transferred here.}
88
{212}{}{Yeah, I was assigned to kill you.}
99
{220}{}{Dammit. I don't have time for this crap, my shift's almost over.}

data/text/po/czech.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgid ""
33
msgstr ""
44
"Project-Id-Version: PACKAGE VERSION\n"
55
"Report-Msgid-Bugs-To: \n"
6-
"POT-Creation-Date: 2025-03-26-20:51+0000\n"
6+
"POT-Creation-Date: 2025-03-26-13:43+0000\n"
77
"PO-Revision-Date: 2024-08-01 14:53+0000\n"
88
"Last-Translator: tygyh <jonis9898@hotmail.com>\n"
99
"Language-Team: Czech <https://tra.bgforge.net/projects/fallout/rp/cs/>\n"
@@ -63738,7 +63738,7 @@ msgstr "Je stále naživu. Vrátím se, až ho vyřídím."
6373863738

6373963739
#: dialog/fcdrshng.msg:562
6374063740
msgid ""
63741-
"I'm not going to kill Dr. Sheng for you. I gave them the plant sample, and "
63741+
"I'm not going to kill Dr. Wong for you. I gave them the plant sample, and "
6374263742
"now I'm done helping you."
6374363743
msgstr ""
6374463744
"Nezabiju pro vás Dr. Wonga. Obdrželi ode mě ten vzorek a tím jsme spolu "
@@ -91949,7 +91949,7 @@ msgstr ""
9194991949

9195091950
#: dialog/hcguard2.msg:210
9195191951
msgid ""
91952-
"Awe, man -- Hey, wait a minute! I've never seen you around before. What are "
91952+
"Oh, man -- Hey, wait a minute! I've never seen you around before. What are "
9195391953
"you doing here?"
9195491954
msgstr "Nazdar... hej, počkej! Nikdy jsem tě tu ještě neviděl. Co tady děláš?"
9195591955

data/text/po/english.pot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgid ""
33
msgstr ""
44
"Project-Id-Version: PACKAGE VERSION\n"
55
"Report-Msgid-Bugs-To: \n"
6-
"POT-Creation-Date: 2025-03-26-20:51+0000\n"
6+
"POT-Creation-Date: 2025-03-26-13:43+0000\n"
77
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
99
"Language: \n"
@@ -56776,7 +56776,7 @@ msgstr ""
5677656776

5677756777
#: dialog/fcdrshng.msg:562
5677856778
msgid ""
56779-
"I'm not going to kill Dr. Sheng for you. I gave them the plant sample, and "
56779+
"I'm not going to kill Dr. Wong for you. I gave them the plant sample, and "
5678056780
"now I'm done helping you."
5678156781
msgstr ""
5678256782

@@ -81637,7 +81637,7 @@ msgstr ""
8163781637

8163881638
#: dialog/hcguard2.msg:210
8163981639
msgid ""
81640-
"Awe, man -- Hey, wait a minute! I've never seen you around before. What are "
81640+
"Oh, man -- Hey, wait a minute! I've never seen you around before. What are "
8164181641
"you doing here?"
8164281642
msgstr ""
8164381643

0 commit comments

Comments
 (0)