Skip to content

Commit

Permalink
Merge branch 'master' into pixote-map-update
Browse files Browse the repository at this point in the history
  • Loading branch information
NovaRain committed Jul 30, 2024
2 parents 8234900 + 6055dc7 commit 9db1ac0
Show file tree
Hide file tree
Showing 19 changed files with 40 additions and 41 deletions.
Binary file added data/art/inven/flask.frm
Binary file not shown.
2 changes: 1 addition & 1 deletion data/text/french/dialog/vccasidy.msg
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +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]}
{30300}{}{[Suivant]}
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}{}{You have become addicted to alcohol. The thirst for alcohol will soon consume you. You lost 1 Agility and 1 Charisma}
{1}{}{Tu es devenu accroc à l'alcool. Ta soif finira par te consumer très bientôt. Tu perds 1 point d'Agilité et 1 point de Charisme.}
{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}{}{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}
{4}{}{Tu sens qu'un lourd fardeau s'est évacué de ton esprit. Tu ne ressens plus le manque d'alcool. Tu récupères un 1 point d'Agilité et 1 point de Charisme}
19 changes: 5 additions & 14 deletions data/text/po/french.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-10-16:29+0000\n"
"PO-Revision-Date: 2024-06-02 18:47+0000\n"
"PO-Revision-Date: 2024-07-27 10:53+0000\n"
"Last-Translator: HawK <[email protected]>\n"
"Language-Team: French <https://tra.bgforge.net/projects/fallout/rp/fr/>\n"
"Language: french\n"
Expand Down Expand Up @@ -221993,10 +221993,8 @@ 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 !"
msgstr "[Suivant]"

#: dialog/vccharly.msg:100 dialog/vccharly.msg:102 dialog/vccharly.msg:105
#: dialog/vccharly.msg:108
Expand Down Expand Up @@ -265416,15 +265414,12 @@ 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. You lost 1 Agility and 1 Charisma"
msgstr ""
"Tu es devenu accroc à l'alcool. Ta soif finira par te consumer très bientôt."
"Tu es devenu accroc à l'alcool. Ta soif finira par te consumer très bientôt. "
"Tu perds 1 point d'Agilité et 1 point de Charisme."

#: game/k_alcohl.msg:2
msgid "The cravings are getting worse."
Expand All @@ -265439,16 +265434,12 @@ 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 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."
"le manque d'alcool. Tu récupères un 1 point d'Agilité et 1 point de Charisme"

#: game/lsgame.msg:100 game/lsgame.msg:110 game/misc.msg:11 game/options.msg:1
msgid "LOAD GAME"
Expand Down
20 changes: 14 additions & 6 deletions data/text/po/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-10-16:29+0000\n"
"PO-Revision-Date: 2024-07-24 05:53+0000\n"
"PO-Revision-Date: 2024-07-29 16:53+0000\n"
"Last-Translator: tygyh <[email protected]>\n"
"Language-Team: none\n"
"Language: sv\n"
Expand Down Expand Up @@ -1244,12 +1244,12 @@ msgstr "Ditt uppdrag under mutantfästet är framgångsrikt."
#. indexed_txt
#: cuts/nar_38.txt:2 cuts/nar_39.txt:2
msgid "Your actions today will influence the outside world for years to come."
msgstr ""
msgstr "Dina handlingar idag kommer att påverka omvärlden i många år framöver."

#. indexed_txt
#: cuts/nar_39.txt:1
msgid "Your mission beneath the Cathedral is successful."
msgstr ""
msgstr "Ditt uppdrag under katedralen är framgångsrikt."

#. indexed_txt
#: cuts/nar_40.txt:1
Expand All @@ -1261,19 +1261,21 @@ msgstr ""
#. indexed_txt
#: cuts/nar_40.txt:2
msgid "Only a single question remained unanswered: What happened to you?"
msgstr ""
msgstr "Bara en enda fråga förblev obesvarad: Vad hände med dig?"

#. indexed_txt
#: cuts/nar_41.txt:1
msgid ""
"You march into the desert sands, leaving the shattered corpse of the "
"Overseer behind you, never to return to the Vault."
msgstr ""
"Du marscherar ut i ökensanden och lämnar Övervakarens förstörda kropp bakom "
"dig, för att aldrig återvända till Valvet."

#. indexed_txt
#: cuts/nar_42.txt:1
msgid "You march into the desert sands, leaving the Vault behind you."
msgstr ""
msgstr "Du marscherar in i ökensanden och lämnar Valvet bakom dig."

#. indexed_txt
#: cuts/nar_44.txt:1
Expand Down Expand Up @@ -1306,18 +1308,24 @@ msgid ""
"technical expertise, combined with the villagers survival skills, allowed "
"the new settlement to grow and prosper."
msgstr ""
"Medlemmarna i Vault 13 befann sig hundratals mil från sitt valv och valde "
"att tillsammans med byborna etablera ett nytt samhälle, och deras tekniska "
"expertis i kombination med bybornas överlevnadskunskaper gjorde att den nya "
"bosättningen kunde växa och blomstra."

#. indexed_txt
#: cuts/nar_ar1.txt:3
msgid ""
"Two generations of the same bloodline were re-united, and their savior, the "
"Chosen One, became Elder, presiding over the village in the years to come."
msgstr ""
"Två generationer av samma blodslinje återförenades och deras räddare, Den "
"Utvalde, blev Äldste och ledde byn under de kommande åren."

#. indexed_txt
#: cuts/nar_bh1.txt:1
msgid "The destruction of the mutants ensured the death of the town."
msgstr ""
msgstr "Utrotningen av mutanterna säkerställde stadens död."

#. indexed_txt
#: cuts/nar_bh1.txt:2
Expand Down
2 changes: 1 addition & 1 deletion data/text/swedish/cuts/nar_38.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1:Ditt uppdrag under mutantfästet är framgångsrikt.
2:Your actions today will influence the outside world for years to come.
2:Dina handlingar idag kommer att påverka omvärlden i många år framöver.
4 changes: 2 additions & 2 deletions data/text/swedish/cuts/nar_39.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1:Your mission beneath the Cathedral is successful.
2:Your actions today will influence the outside world for years to come.
1:Ditt uppdrag under katedralen är framgångsrikt.
2:Dina handlingar idag kommer att påverka omvärlden i många år framöver.
2 changes: 1 addition & 1 deletion data/text/swedish/cuts/nar_40.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1:Your involvement with the various places and people of the Wasteland is well documented by future historians.
2:Only a single question remained unanswered: What happened to you?
2:Bara en enda fråga förblev obesvarad: Vad hände med dig?
2 changes: 1 addition & 1 deletion data/text/swedish/cuts/nar_41.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1:You march into the desert sands, leaving the shattered corpse of the Overseer behind you, never to return to the Vault.
1:Du marscherar ut i ökensanden och lämnar Övervakarens förstörda kropp bakom dig, för att aldrig återvända till Valvet.
2 changes: 1 addition & 1 deletion data/text/swedish/cuts/nar_42.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1:You march into the desert sands, leaving the Vault behind you.
1:Du marscherar in i ökensanden och lämnar Valvet bakom dig.
4 changes: 2 additions & 2 deletions data/text/swedish/cuts/nar_ar1.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1:After the Enclave's destruction, the refugees of Arroyo and Vault 13 resettled, building a new community with the aid of the Garden of Eden Creation Kit.
2:Finding themselves hundreds of miles from their Vault, the members of Vault 13 chose to join the villagers in establishing a new community, and their technical expertise, combined with the villagers survival skills, allowed the new settlement to grow and prosper.
3:Two generations of the same bloodline were re-united, and their savior, the Chosen One, became Elder, presiding over the village in the years to come.
2:Medlemmarna i Vault 13 befann sig hundratals mil från sitt valv och valde att tillsammans med byborna etablera ett nytt samhälle, och deras tekniska expertis i kombination med bybornas överlevnadskunskaper gjorde att den nya bosättningen kunde växa och blomstra.
3:Två generationer av samma blodslinje återförenades och deras räddare, Den Utvalde, blev Äldste och ledde byn under de kommande åren.
2 changes: 1 addition & 1 deletion data/text/swedish/cuts/nar_bh1.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1:The destruction of the mutants ensured the death of the town.
1:Utrotningen av mutanterna säkerställde stadens död.
2:Without their strength and ability to withstand the toxins within the mine, the valuable ore proved unattainable.
3:Those who caused this destruction rejoiced at first... until they realized the foolishness of what they had done.
4:They struggled to keep the community flourishing, but to no avail.
Expand Down
2 changes: 1 addition & 1 deletion data/text/swedish/cuts_female/nar_38.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1:Ditt uppdrag under mutantfästet är framgångsrikt.
2:Your actions today will influence the outside world for years to come.
2:Dina handlingar idag kommer att påverka omvärlden i många år framöver.
4 changes: 2 additions & 2 deletions data/text/swedish/cuts_female/nar_39.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1:Your mission beneath the Cathedral is successful.
2:Your actions today will influence the outside world for years to come.
1:Ditt uppdrag under katedralen är framgångsrikt.
2:Dina handlingar idag kommer att påverka omvärlden i många år framöver.
2 changes: 1 addition & 1 deletion data/text/swedish/cuts_female/nar_40.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1:Your involvement with the various places and people of the Wasteland is well documented by future historians.
2:Only a single question remained unanswered: What happened to you?
2:Bara en enda fråga förblev obesvarad: Vad hände med dig?
2 changes: 1 addition & 1 deletion data/text/swedish/cuts_female/nar_41.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1:You march into the desert sands, leaving the shattered corpse of the Overseer behind you, never to return to the Vault.
1:Du marscherar ut i ökensanden och lämnar Övervakarens förstörda kropp bakom dig, för att aldrig återvända till Valvet.
2 changes: 1 addition & 1 deletion data/text/swedish/cuts_female/nar_42.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1:You march into the desert sands, leaving the Vault behind you.
1:Du marscherar in i ökensanden och lämnar Valvet bakom dig.
4 changes: 2 additions & 2 deletions data/text/swedish/cuts_female/nar_ar1.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1:After the Enclave's destruction, the refugees of Arroyo and Vault 13 resettled, building a new community with the aid of the Garden of Eden Creation Kit.
2:Finding themselves hundreds of miles from their Vault, the members of Vault 13 chose to join the villagers in establishing a new community, and their technical expertise, combined with the villagers survival skills, allowed the new settlement to grow and prosper.
3:Two generations of the same bloodline were re-united, and their savior, the Chosen One, became Elder, presiding over the village in the years to come.
2:Medlemmarna i Vault 13 befann sig hundratals mil från sitt valv och valde att tillsammans med byborna etablera ett nytt samhälle, och deras tekniska expertis i kombination med bybornas överlevnadskunskaper gjorde att den nya bosättningen kunde växa och blomstra.
3:Två generationer av samma blodslinje återförenades och deras räddare, Den Utvalde, blev Äldste och ledde byn under de kommande åren.
2 changes: 1 addition & 1 deletion data/text/swedish/cuts_female/nar_bh1.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1:The destruction of the mutants ensured the death of the town.
1:Utrotningen av mutanterna säkerställde stadens död.
2:Without their strength and ability to withstand the toxins within the mine, the valuable ore proved unattainable.
3:Those who caused this destruction rejoiced at first... until they realized the foolishness of what they had done.
4:They struggled to keep the community flourishing, but to no avail.
Expand Down

0 comments on commit 9db1ac0

Please sign in to comment.