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/po/spanish.po
  • Loading branch information
NovaRain committed Jan 11, 2025
2 parents 9f9370a + 1bebb36 commit abac08a
Show file tree
Hide file tree
Showing 41 changed files with 544 additions and 636 deletions.
2 changes: 0 additions & 2 deletions data/text/czech/dialog/obj_dude.msg
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
{700}{}{Přiložíš k sobě roztrhané kousky papíru a získáš tak list se třemi hesly.}
{900}{}{Něco není v pořádku s tvým žaludkem.}
{901}{}{Cítíš silný tlak v žaludku.}
{1000}{}{Nedokážeš normálně myslet. Máš vášnivou touhu otevřít další balíček karet Tragic.}
{1001}{}{Cítíš se, jako by z tebe spadl velký kámen. Karty Tragic už nejsou to jediné, co se ti honí hlavou.}
2 changes: 2 additions & 0 deletions data/text/czech/game/k_tragic.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{1000}{}{Nedokážeš normálně myslet. Máš vášnivou touhu otevřít další balíček karet Tragic.}
{1001}{}{Cítíš se, jako by z tebe spadl velký kámen. Karty Tragic už nejsou to jediné, co se ti honí hlavou.}
3 changes: 0 additions & 3 deletions data/text/english/dialog/obj_dude.msg
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,3 @@

{900}{}{Something doesn't feel quite right in your stomach.}
{901}{}{You feel an intense pressure in your stomach.}

{1000}{}{You cannot think straight. You feel a burning desire to open another box of Tragic cards.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 2 additions & 0 deletions data/text/english/game/k_tragic.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{1000}{}{You cannot think straight. You feel a burning desire to open another box of Tragic cards.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 0 additions & 2 deletions data/text/french/dialog/obj_dude.msg
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
{700}{}{Tu attaches les bouts de papier déchirés ensemble et tu récupères une liste de trois mots de passe.}
{900}{}{Quelque chose ne va pas avec ton estomac, tu peux le sentir.}
{901}{}{Tu ressens une pression intense dans ton estomac.}
{1000}{}{Tu ne peux plus penser clairement. Tu ressens un désir ardent d'ouvrir une nouvelle boite de carte Tragic.}
{1001}{}{Tu sens qu'un lourd fardeau s'est évacué de ton esprit. Tu réussis à ne plus penser aux cartes Tragic pendant un moment.}
2 changes: 2 additions & 0 deletions data/text/french/game/k_tragic.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{1000}{}{Tu ne peux plus penser clairement. Tu ressens un désir ardent d'ouvrir une nouvelle boite de carte Tragic.}
{1001}{}{Tu sens qu'un lourd fardeau s'est évacué de ton esprit. Tu réussis à ne plus penser aux cartes Tragic pendant un moment.}
2 changes: 0 additions & 2 deletions data/text/german/dialog/obj_dude.msg
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
{700}{}{Du fügst die zerrissenen Papierstücke zusammen, um eine Liste mit drei Passwörtern zu erhalten.}
{900}{}{In deinem Magen fühlt sich etwas nicht richtig an.}
{901}{}{Du spürst einen starken Druck in deinem Magen.}
{1000}{}{Du kannst nicht klar denken. Du fühlst das brennende Verlangen, noch eine Schachtel Tragic Karten zu öffnen.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 2 additions & 0 deletions data/text/german/game/k_tragic.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{1000}{}{Du kannst nicht klar denken. Du fühlst das brennende Verlangen, noch eine Schachtel Tragic Karten zu öffnen.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 0 additions & 2 deletions data/text/hungarian/dialog/obj_dude.msg
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
{700}{}{You attach the torn pieces of paper together to yield a list of three passwords.}
{900}{}{Something doesn't feel quite right in your stomach.}
{901}{}{You feel an intense pressure in your stomach.}
{1000}{}{You cannot think straight. You feel a burning desire to open another box of Tragic cards.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 2 additions & 0 deletions data/text/hungarian/game/k_tragic.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{1000}{}{You cannot think straight. You feel a burning desire to open another box of Tragic cards.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 0 additions & 2 deletions data/text/italian/dialog/obj_dude.msg
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
{700}{}{You attach the torn pieces of paper together to yield a list of three passwords.}
{900}{}{Something doesn't feel quite right in your stomach.}
{901}{}{You feel an intense pressure in your stomach.}
{1000}{}{You cannot think straight. You feel a burning desire to open another box of Tragic cards.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
2 changes: 2 additions & 0 deletions data/text/italian/game/k_tragic.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{1000}{}{You cannot think straight. You feel a burning desire to open another box of Tragic cards.}
{1001}{}{You feel as if a great burden has been lifted from your mind. No longer is Tragic a constant part of your thoughts.}
36 changes: 18 additions & 18 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-11-09-01:14+0000\n"
"POT-Creation-Date: 2025-01-11-10:28+0000\n"
"PO-Revision-Date: 2024-08-01 14:53+0000\n"
"Last-Translator: tygyh <[email protected]>\n"
"Language-Team: Czech <https://tra.bgforge.net/projects/fallout/rp/cs/>\n"
Expand Down Expand Up @@ -16975,7 +16975,7 @@ msgstr "Tvému autu došlo palivo. Určitě s sebou vozíš náhradní články,
msgid "You hear some sounds coming from within the caves."
msgstr "Z jeskyně vycházejí nějaké zvuky."

#: dialog/cave6.msg:100 dialog/cave06.msg:100 dialog/cave7.msg:100
#: dialog/cave06.msg:100 dialog/cave6.msg:100 dialog/cave7.msg:100
msgid "You enter a dark cave. There are rat droppings everywhere."
msgstr "Vstupuješ do temné jeskyně. Všude kolem jsou krysí výkaly."

Expand Down Expand Up @@ -172167,22 +172167,6 @@ msgid ""
msgstr ""
"Přiložíš k sobě roztrhané kousky papíru a získáš tak list se třemi hesly."

#: dialog/obj_dude.msg:1000
msgid ""
"You cannot think straight. You feel a burning desire to open another box of "
"Tragic cards."
msgstr ""
"Nedokážeš normálně myslet. Máš vášnivou touhu otevřít další balíček karet "
"Tragic."

#: dialog/obj_dude.msg:1001
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer is "
"Tragic a constant part of your thoughts."
msgstr ""
"Cítíš se, jako by z tebe spadl velký kámen. Karty Tragic už nejsou to "
"jediné, co se ti honí hlavou."

#: dialog/ocariel.msg:100
msgid "You see a short, slender woman wearing a blue velvet sun dress."
msgstr "Vidíš malou štíhlou ženu v modrých sametových letních šatech."
Expand Down Expand Up @@ -257319,6 +257303,22 @@ msgid ""
msgstr ""
"Cítíš se, jako by z tebe spadl velký kámen. Už nemáš touhu pít alkohol."

#: game/k_tragic.msg:1000
msgid ""
"You cannot think straight. You feel a burning desire to open another box of "
"Tragic cards."
msgstr ""
"Nedokážeš normálně myslet. Máš vášnivou touhu otevřít další balíček karet "
"Tragic."

#: game/k_tragic.msg:1001
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer is "
"Tragic a constant part of your thoughts."
msgstr ""
"Cítíš se, jako by z tebe spadl velký kámen. Karty Tragic už nejsou to "
"jediné, co se ti honí hlavou."

#: game/lsgame.msg:100 game/lsgame.msg:110 game/misc.msg:11 game/options.msg:1
msgid "LOAD GAME"
msgstr "NAČÍST HRU"
Expand Down
30 changes: 15 additions & 15 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-11-09-01:14+0000\n"
"POT-Creation-Date: 2025-01-11-10:28+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.3.0\n"
"X-Generator: BGforge/msg2po v.1.3.1\n"

#: cuts/afailed.sve:10
msgid "Chosen. The village dies. All of our futures die, too."
Expand Down Expand Up @@ -14885,7 +14885,7 @@ msgstr ""
msgid "You hear some sounds coming from within the caves."
msgstr ""

#: dialog/cave6.msg:100 dialog/cave06.msg:100 dialog/cave7.msg:100
#: dialog/cave06.msg:100 dialog/cave6.msg:100 dialog/cave7.msg:100
msgid "You enter a dark cave. There are rat droppings everywhere."
msgstr ""

Expand Down Expand Up @@ -153005,18 +153005,6 @@ msgid ""
"passwords."
msgstr ""

#: dialog/obj_dude.msg:1000
msgid ""
"You cannot think straight. You feel a burning desire to open another box of "
"Tragic cards."
msgstr ""

#: dialog/obj_dude.msg:1001
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer is "
"Tragic a constant part of your thoughts."
msgstr ""

#: dialog/ocariel.msg:100
msgid "You see a short, slender woman wearing a blue velvet sun dress."
msgstr ""
Expand Down Expand Up @@ -229302,6 +229290,18 @@ msgid ""
"you feel the need to drink alcohol. You regained 1 Agility and 1 Charisma"
msgstr ""

#: game/k_tragic.msg:1000
msgid ""
"You cannot think straight. You feel a burning desire to open another box of "
"Tragic cards."
msgstr ""

#: game/k_tragic.msg:1001
msgid ""
"You feel as if a great burden has been lifted from your mind. No longer is "
"Tragic a constant part of your thoughts."
msgstr ""

#: game/lsgame.msg:100 game/lsgame.msg:110 game/misc.msg:11 game/options.msg:1
msgid "LOAD GAME"
msgstr ""
Expand Down
Loading

0 comments on commit abac08a

Please sign in to comment.