Skip to content

Commit f26c987

Browse files
committed
Merge branch 'master' into 2.4_Lite
2 parents 4c08926 + 0d86fac commit f26c987

File tree

294 files changed

+1975
-1508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+1975
-1508
lines changed

data/text/czech/dialog/nceldrid.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{472}{}{Tak na to zapomeň. Potřebuju ještě něco jiného...}
126126
{473}{}{Ne, díky. Zatím.}
127127
{474}{}{To je na mě příliš drahé. Promluvíme si o tom, až budu mít víc peněz.}
128-
{480}{}{(Usměje se a mne si ruce, když položíš peníze na stůl.) Fajn, tady to máš. Ještě něco? }
128+
{480}{}{(Usměje se a mne si ruce, když položíš peníze na stůl.) Fajn, tady to máš. }
129129
{481}{}{(Chvíli o tom přemýšlí, prohlédne si tě a poté kývne.) No tak jo... dám ti to skoro zadarmo, tady máš. (Předá ti modul a vezme si peníze.) }
130130
{482}{}{Ještě něco?}
131131
{485}{}{Jo, ještě by se mi něco hodilo...}

data/text/czech/dialog/newr1.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
{462}{}{Butch Coolidge}
172172
{463}{}{Zatoulaná Kočka}
173173
{464}{}{Bad Mojo}
174-
{465}{}{Tank}
174+
{465}{made_man_name}{Tank}
175175
{466}{}{Mlátička}
176176
{467}{}{Mynx}
177177
{468}{}{Škorpion}

data/text/czech/dialog/vcrandal.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{143}{}{No, nevadí.}
4545
{144}{}{Zkuste prohledat databázi centrálního počítače Vaultu. Třeba jsou v něm souřadnice nějakých jiných Vaultů. Sice o tom pochybuji, ale za pokus to stojí.}
4646
{145}{}{No, kdybyste měl přístup k našemu centrálnímu počítači, možná byste našel nějaké zmínky o jiných Vaultech. Ale pouze Občané města mohou vstoupit do Vaultu.}
47-
{146}{}{Dík.}
47+
{146}{low_iq_thank_you}{Tanks}
4848
{147}{}{Nebude vám vadit, když se zeptám na něco jiného?}
4949
{148}{}{Díky za informace.}
5050
{149}{}{Zdravím, vítejte zpět. Můžu pro vás něco udělat?}

data/text/english/dialog/nceldrid.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
{474}{}{Too rich for my blood. Let's talk some other time when I have some more money.}
182182

183183
# 22. BUY IT (20, 21)
184-
{480}{}{(Smiles, rubs hands as you lay the money on the table.) Awright, here you go. Anything else? }
184+
{480}{}{(Smiles, rubs hands as you lay the money on the table.) Awright, here you go. }
185185
{481}{}{(Thinks about it for a moment, studies you, then nods.) Awright then... I'm letting you have it for a steal, but
186186
here you go. (Hands you the module, takes your money.) }
187187
{482}{}{Anything else?}

data/text/english/dialog/newr1.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
{462}{}{Butch Coolidge}
186186
{463}{}{Alley Cat}
187187
{464}{}{Bad Mojo}
188-
{465}{}{Tank}
188+
{465}{made_man_name}{Tank}
189189
{466}{}{Bruiser}
190190
{467}{}{Mynx}
191191
{468}{}{Scorpion}

data/text/english/dialog/vcrandal.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{143}{}{Well, never mind then.}
4545
{144}{}{You could go scan the Vault Central Computer, see if it has any coordinates for any other Vaults. I doubt it, but no harm in checking.}
4646
{145}{}{Well, if you had access to our Vault Central Computer, you might be able to find some mention of some other Vaults. But only Citizens are allowed in the Vault.}
47-
{146}{}{Tanks}
47+
{146}{low_iq_thank_you}{Tanks}
4848
{147}{}{Mind if I ask you something else?}
4949
{148}{}{Thanks for the information.}
5050
{149}{}{Hey there, welcome back. Anything I can do for you?}

data/text/french/dialog/nceldrid.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
{472}{}{Alors, laisse tomber. Je voulais autre chose.}
125125
{473}{}{Alors, non merci. A un de ces quatre.}
126126
{474}{}{Trop cher pour moi. On en reparlera quand j'aurai les moyens. }
127-
{480}{}{[Il sourit, se frotte les mains pendant que tu allonges les billets sur la table.] D'accord, voilà. Autre chose ?}
127+
{480}{}{[Il sourit, se frotte les mains pendant que tu allonges les billets sur la table.] D'accord, voilà. }
128128
{481}{}{[Il réfléchit un instant, t'observe, puis acquiesce.] D'accord. C'est du vol, mais je te le laisse à ce prix. Voilà. [Il te tend le module et tu prends l'argent.]}
129129
{482}{}{Rien d'autre ?}
130130
{485}{}{Ouais, je m'intéresse à autre chose.}

data/text/french/dialog/newr1.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
{462}{}{Bernard Froideure}
172172
{463}{}{Anne Halle}
173173
{464}{}{La Poisse}
174-
{465}{}{Le Char}
174+
{465}{made_man_name}{Tank}
175175
{466}{}{La Châtaigne}
176176
{467}{}{Coquine}
177177
{468}{}{L'Alligator}

data/text/french/dialog/vcrandal.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{143}{}{Bon, c'est pas grave.}
4545
{144}{}{Tu pourrais interroger l'ordinateur central de l'Abri, pour voir s'il contient des informations sur d'autres abris. J'en doute, mais ça vaut le coup d'essayer.}
4646
{145}{}{Eh bien, si tu avais accès à l'ordinateur central de l'Abri, tu pourrais trouver des indications sur d'autres abris. Malheureusement, seuls les citoyens sont autorisés à entrer dans l'Abri.}
47-
{146}{}{Merchi.}
47+
{146}{low_iq_thank_you}{Tanks}
4848
{147}{}{Puis-je te demander autre chose ?}
4949
{148}{}{Merci pour les informations.}
5050
{149}{}{Salut, content de te revoir. Puis-je faire quelque chose pour toi ?}

data/text/german/dialog/newr1.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
{462}{}{Butch Coolidge}
172172
{463}{}{Streuner}
173173
{464}{}{Bad Mojo}
174-
{465}{}{Panzer}
174+
{465}{made_man_name}{Tank}
175175
{466}{}{Schläger}
176176
{467}{}{Mynx}
177177
{468}{}{Skorpion}

0 commit comments

Comments
 (0)