Skip to content

Commit

Permalink
Merge branch 'master' into pixote-map-update
Browse files Browse the repository at this point in the history
# Conflicts:
#	data/text/czech/game/k_alcohl.msg
#	data/text/french/game/k_alcohl.msg
#	data/text/german/game/k_alcohl.msg
#	data/text/hungarian/game/k_alcohl.msg
#	data/text/italian/game/k_alcohl.msg
#	data/text/po/czech.po
#	data/text/po/english.pot
#	data/text/po/french.po
#	data/text/po/german.po
#	data/text/po/hungarian.po
#	data/text/po/italian.po
#	data/text/po/polish.po
#	data/text/po/portuguese.po
#	data/text/po/russian.po
#	data/text/po/spanish.po
#	data/text/po/sv.po
#	data/text/po/vi.po
#	data/text/polish/game/k_alcohl.msg
#	data/text/portuguese/game/k_alcohl.msg
#	data/text/russian/game/k_alcohl.msg
#	data/text/spanish/game/k_alcohl.msg
#	data/text/swedish/game/k_alcohl.msg
#	data/text/vietnamese/game/k_alcohl.msg
  • Loading branch information
NovaRain committed Jul 3, 2024
2 parents 6744561 + 137d667 commit efa7038
Show file tree
Hide file tree
Showing 767 changed files with 7,367 additions and 6,455 deletions.
1 change: 1 addition & 0 deletions data/text/czech/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,4 @@
{30000}{}{Ách, cítím se teď o moc líp. Mám pocit, že je teď všechno snazší.}
{30001}{}{Hmm, cítím se teď jinak. Ty pilulky na srdce nejspíš fungujou.}
{30100}{}{Jo, proč ne... budu se po tom cítit jako mrtvola.}
{30300}{}{[Next]}
4 changes: 2 additions & 2 deletions data/text/czech/game/k_alcohl.msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{1}{}{Máš závislost na alkoholu. Žízeň po něm tě brzy pohltí.}
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{2}{}{Dostáváš čím dál větší chuť na alkohol.}
{3}{}{Třeseš se. Máš silnou touhu vypít něco alkoholického.}
{4}{}{Cítíš se, jako by z tebe spadl velký kámen. Už nemáš touhu pít alkohol.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma}
2 changes: 2 additions & 0 deletions data/text/english/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -259,3 +259,5 @@
{30000}{}{Ah, that actually feels good. I feel like I can handle things much better now.}
{30001}{}{Wow, this feels different. Those heart pills must be working.}
{30100}{}{Yeah, why not... It'll help me feel like I'm dead.}

{30300}{}{[Next]}
4 changes: 2 additions & 2 deletions data/text/english/game/k_alcohl.msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you.}
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{2}{}{The cravings are getting worse.}
{3}{}{You've got the shakes. You have this intense urge to drink something with alcohol in it.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you crave the need to drink alcohol.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma}
1 change: 1 addition & 0 deletions data/text/french/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,4 @@
{30000}{}{Ah, ça fait du bien. Je crois que je pourrais mieux m'en tirer maintenant.}
{30001}{}{Wahou, j'me sens vraiment différent. Ces pilules marchent vraiment.}
{30100}{}{Ouais, pourquoi pas... Ca m'aidera à me sentir moins vivant.}
{30300}{}{[Next]}
4 changes: 2 additions & 2 deletions data/text/french/game/k_alcohl.msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{1}{}{Tu es devenu accroc à l'alcool. Ta soif finira par te consumer très bientôt.}
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{2}{}{Le manque est en train d'empirer.}
{3}{}{Tu as des tremblements. Tu as cette envie intense de boire quelque chose alcoolisé, tout de suite.}
{4}{}{Tu sens qu'un lourd fardeau s'est évacué de ton esprit. Tu ne ressens plus le manque d'alcool.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma}
1 change: 1 addition & 0 deletions data/text/german/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -289,3 +289,4 @@ Stimpaks übrig hättest, die könnt ich jetzt wirklich gebrauchen. Ich kann abe
{30000}{}{Ah, das tut gut! Jetzt bin ich wieder voll da.}
{30001}{}{Wow, ist ein bisschen komisch, aber diese Herzpillen sind echt gut.}
{30100}{}{Yeah, why not... It'll help me feel like I'm dead.}
{30300}{}{[Next]}
4 changes: 2 additions & 2 deletions data/text/german/game/k_alcohl.msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{1}{}{Du bist süchtig nach Alkohol. Die Gier nach Alkohol wird dich bald vernichten.}
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{2}{}{Das Verlangen wird immer schlimmer.}
{3}{}{You've got the shakes. You have this intense urge to drink something with alcohol in it.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you crave the need to drink alcohol.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma}
1 change: 1 addition & 0 deletions data/text/hungarian/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,4 @@
{30000}{}{Ah, that actually feels good. I feel like I can handle things much better now.}
{30001}{}{Wow, this feels different. Those heart pills must be working.}
{30100}{}{Yeah, why not... It'll help me feel like I'm dead.}
{30300}{}{[Next]}
4 changes: 2 additions & 2 deletions data/text/hungarian/game/k_alcohl.msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you.}
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{2}{}{The cravings are getting worse.}
{3}{}{You've got the shakes. You have this intense urge to drink something with alcohol in it.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you crave the need to drink alcohol.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma}
1 change: 1 addition & 0 deletions data/text/italian/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,4 @@
{30000}{}{Ah, that actually feels good. I feel like I can handle things much better now.}
{30001}{}{Wow, this feels different. Those heart pills must be working.}
{30100}{}{Yeah, why not... It'll help me feel like I'm dead.}
{30300}{}{[Next]}
4 changes: 2 additions & 2 deletions data/text/italian/game/k_alcohl.msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you.}
{1}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{2}{}{The cravings are getting worse.}
{3}{}{You've got the shakes. You have this intense urge to drink something with alcohol in it.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you crave the need to drink alcohol.}
{4}{}{You feel as if a great burden has been lifted from your mind. No longer do you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma}
20 changes: 17 additions & 3 deletions data/text/po/czech.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-02-07:06+0000\n"
"POT-Creation-Date: 2024-07-03-11:08+0000\n"
"PO-Revision-Date: 2024-05-20 17:47+0000\n"
"Last-Translator: Mikulas Krupicka <[email protected]>\n"
"Language-Team: Czech <https://tra.bgforge.net/projects/fallout/rp/cs/>\n"
Expand Down Expand Up @@ -214807,6 +214807,12 @@ msgstr "Hmm, cítím se teď jinak. Ty pilulky na srdce nejspíš fungujou."
msgid "Yeah, why not... It'll help me feel like I'm dead."
msgstr "Jo, proč ne... budu se po tom cítit jako mrtvola."

#: dialog/vccasidy.msg:30300
#, fuzzy
#| msgid "Next!"
msgid "[Next]"
msgstr "Další!"

#: dialog/vccharly.msg:100 dialog/vccharly.msg:102 dialog/vccharly.msg:105
#: dialog/vccharly.msg:108
msgid "You see Charlie."
Expand Down Expand Up @@ -257285,9 +257291,13 @@ msgid "Long"
msgstr "Dlouhá"

#: game/k_alcohl.msg:1
#, fuzzy
#| msgid ""
#| "You have become addicted to alcohol. The thirst for alcohol will soon "
#| "consume you."
msgid ""
"You have become addicted to alcohol. The thirst for alcohol will soon "
"consume you."
"consume you. You lost 1 Agility and 1 Charisma"
msgstr "Máš závislost na alkoholu. Žízeň po něm tě brzy pohltí."

#: game/k_alcohl.msg:2
Expand All @@ -257301,9 +257311,13 @@ msgid ""
msgstr "Třeseš se. Máš silnou touhu vypít něco alkoholického."

#: game/k_alcohl.msg:4
#, fuzzy
#| msgid ""
#| "You feel as if a great burden has been lifted from your mind. No longer do "
#| "you crave the need to drink alcohol."
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer do "
"you crave the need to drink alcohol."
"you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma"
msgstr ""
"Cítíš se, jako by z tebe spadl velký kámen. Už nemáš touhu pít alkohol."

Expand Down
12 changes: 8 additions & 4 deletions data/text/po/english.pot
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-02-07:06+0000\n"
"POT-Creation-Date: 2024-07-03-11:08+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: BGforge/msg2po v.1.2.2\n"
"X-Generator: BGforge/msg2po v.1.2.3\n"

#: cuts/afailed.sve:10
msgid "Chosen. The village dies. All of our futures die, too."
Expand Down Expand Up @@ -190249,6 +190249,10 @@ msgstr ""
msgid "Yeah, why not... It'll help me feel like I'm dead."
msgstr ""

#: dialog/vccasidy.msg:30300
msgid "[Next]"
msgstr ""

#: dialog/vccharly.msg:100 dialog/vccharly.msg:102 dialog/vccharly.msg:105
#: dialog/vccharly.msg:108
msgid "You see Charlie."
Expand Down Expand Up @@ -229279,7 +229283,7 @@ msgstr ""
#: game/k_alcohl.msg:1
msgid ""
"You have become addicted to alcohol. The thirst for alcohol will soon "
"consume you."
"consume you. You lost 1 Agility and 1 Charisma"
msgstr ""

#: game/k_alcohl.msg:2
Expand All @@ -229295,7 +229299,7 @@ msgstr ""
#: game/k_alcohl.msg:4
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer do "
"you crave the need to drink alcohol."
"you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma"
msgstr ""

#: game/lsgame.msg:100 game/lsgame.msg:110 game/misc.msg:11 game/options.msg:1
Expand Down
20 changes: 17 additions & 3 deletions data/text/po/french.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-02-07:06+0000\n"
"POT-Creation-Date: 2024-07-03-11:08+0000\n"
"PO-Revision-Date: 2024-06-02 18:47+0000\n"
"Last-Translator: HawK <[email protected]>\n"
"Language-Team: French <https://tra.bgforge.net/projects/fallout/rp/fr/>\n"
Expand Down Expand Up @@ -221992,6 +221992,12 @@ msgstr "Wahou, j'me sens vraiment différent. Ces pilules marchent vraiment."
msgid "Yeah, why not... It'll help me feel like I'm dead."
msgstr "Ouais, pourquoi pas... Ca m'aidera à me sentir moins vivant."

#: dialog/vccasidy.msg:30300
#, fuzzy
#| msgid "Next!"
msgid "[Next]"
msgstr "Au suivant !"

#: dialog/vccharly.msg:100 dialog/vccharly.msg:102 dialog/vccharly.msg:105
#: dialog/vccharly.msg:108
msgid "You see Charlie."
Expand Down Expand Up @@ -265410,9 +265416,13 @@ msgid "Long"
msgstr "Longue"

#: game/k_alcohl.msg:1
#, fuzzy
#| msgid ""
#| "You have become addicted to alcohol. The thirst for alcohol will soon "
#| "consume you."
msgid ""
"You have become addicted to alcohol. The thirst for alcohol will soon "
"consume you."
"consume you. You lost 1 Agility and 1 Charisma"
msgstr ""
"Tu es devenu accroc à l'alcool. Ta soif finira par te consumer très bientôt."

Expand All @@ -265429,9 +265439,13 @@ msgstr ""
"alcoolisé, tout de suite."

#: game/k_alcohl.msg:4
#, fuzzy
#| msgid ""
#| "You feel as if a great burden has been lifted from your mind. No longer do "
#| "you crave the need to drink alcohol."
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer do "
"you crave the need to drink alcohol."
"you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma"
msgstr ""
"Tu sens qu'un lourd fardeau s'est évacué de ton esprit. Tu ne ressens plus "
"le manque d'alcool."
Expand Down
Loading

0 comments on commit efa7038

Please sign in to comment.