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 Sep 30, 2024
2 parents 0ed89b9 + f7de0e3 commit 71f5c5d
Show file tree
Hide file tree
Showing 28 changed files with 327 additions and 332 deletions.
6 changes: 3 additions & 3 deletions data/text/po/russian.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-09-07-13:52+0000\n"
"PO-Revision-Date: 2024-09-23 23:09+0000\n"
"PO-Revision-Date: 2024-09-24 08:09+0000\n"
"Last-Translator: Pavel <pavel061090563pavel@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: russian\n"
Expand Down Expand Up @@ -76457,7 +76457,7 @@ msgid ""
" of them ugly-ass ghouls? It's bad enough that I have to watch over my Uncle"
" Lenny, here. Why do you ask?"
msgstr ""
"Гекко? Черт, нет, вы разве не знаете, что это место кишит кривомордыми "
"Гекко? Черт, нет, вы разве не знаете, что это место кишит кривомордыми "
"гулями? Мне и так приходится смотреть за моим дядей Ленни. А почему вы "
"спросили?"

Expand Down Expand Up @@ -86874,7 +86874,7 @@ msgstr "Если ты думаешь, что я тут стою для мебе

#: dialog/generic.msg:3928
msgid "You better not be planning what I think you're planning, stranger."
msgstr "Если я правильно понимаю, что ты хочешь сделать, даже и не пытайся."
msgstr "Ты лучше не замышляй то, что я думаю, чужак."

#: dialog/generic.msg:3929
msgid "What? Like you think I don't notice you? Get outta here!"
Expand Down
104 changes: 62 additions & 42 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-09-07-13:52+0000\n"
"PO-Revision-Date: 2024-09-22 21:09+0000\n"
"PO-Revision-Date: 2024-09-29 09:09+0000\n"
"Last-Translator: tygyh <jonis9898@hotmail.com>\n"
"Language-Team: none\n"
"Language: sv\n"
Expand Down Expand Up @@ -18828,19 +18828,19 @@ msgstr ""

#: dialog/ccmandr.msg:101
msgid "You see the Navarro base Commander."
msgstr ""
msgstr "Du ser befälhavaren för Navarro-basen."

#: dialog/ccmandr.msg:103 dialog/ccqmstr.msg:103
msgid "Who the hell are you guys... Alert! Intruders on the base!"
msgstr ""
msgstr "Vilka fan är ni... Varning! Inkräktare på basen!"

#: dialog/ccmandr.msg:104
msgid "I don't have time to chitchat with the grunts. You're dismissed."
msgstr ""

#: dialog/ccmandr.msg:105 dialog/ccmandr.msg:125
msgid "Time to die."
msgstr ""
msgstr "Dags att dö."

#: dialog/ccmandr.msg:107
msgid ""
Expand All @@ -18854,10 +18854,13 @@ msgid ""
"time to court martial you so I'll handle this myself. Guards! Kill this "
"idiot!"
msgstr ""
"Att inte lyda en direkt order från en högre officer är förräderi. Jag har "
"inte tid att ställa dig inför krigsrätt, så jag sköter det här själv. "
"Vakter! Döda den här idioten!"

#: dialog/ccmandr.msg:110
msgid "Screw you!"
msgstr ""
msgstr "Fan ta dig!"

#: dialog/ccmandr.msg:111
msgid ""
Expand All @@ -18867,44 +18870,47 @@ msgstr ""

#: dialog/ccmandr.msg:112 dialog/ccmandr.msg:114 dialog/ccmandr.msg:116
msgid "Yes sir!"
msgstr ""
msgstr "Ja, sir!"

#: dialog/ccmandr.msg:113
msgid "Make it quick soldier, I don't have all day to stand around."
msgstr ""
msgstr "Gör det snabbt soldat, jag har inte hela dagen på mig att stå här."

#: dialog/ccmandr.msg:115 dialog/ccmandr.msg:124
msgid "Leave my locker alone or I will dish out some serious pain."
msgstr ""
msgstr "Lämna mitt skåp ifred annars kommer jag att göra ditt liv smärtsamt."

#: dialog/ccmandr.msg:117
msgid ""
"This base is on alert and I don't recognize you. Show me your papers, "
"soldier."
msgstr ""
"Den här basen är i beredskap och jag känner inte igen dig. Visa mig dina "
"papper, soldat."

#: dialog/ccmandr.msg:118
msgid "What papers?"
msgstr ""
msgstr "Vilka papper?"

#: dialog/ccmandr.msg:119
msgid "You blow me!"
msgstr ""
msgstr "Dra åt helvete!"

#: dialog/ccmandr.msg:120
msgid "I don't seem to have them with me..."
msgstr ""
msgstr "Jag verkar inte ha dem med mig..."

#: dialog/ccmandr.msg:122
msgid ""
"Wrong answer, maggot. You're to carry your papers with you at all times. You"
" should know that!"
msgstr ""
"Fel svar, kryp. Du ska alltid ha dina papper med dig. Det borde du veta!"

#: dialog/ccmandr.msg:123 dialog/dcmetzge.msg:751 dialog/dctyler.msg:303
#: dialog/gcwooz.msg:705
msgid "Fuck you."
msgstr ""
msgstr "Fan ta dig."

#: dialog/ccmandr.msg:200
msgid ""
Expand Down Expand Up @@ -19047,55 +19053,62 @@ msgstr ""

#: dialog/ccmaster.msg:100
msgid "Big surprise -- it looks like a guy in power armor."
msgstr ""
msgstr "Stor överraskning -- det ser ut som en snubbe i kraftrustning."

#: dialog/ccmaster.msg:101
msgid "Yep, it's still a guy in power armor."
msgstr ""
msgstr "Japp, det är fortfarande en snubbe i kraftrustning."

#: dialog/ccmaster.msg:102
msgid ""
"He's got some kind of insignia on his chest that different from any of the others you've seen\n"
" around here. "
msgstr ""
"Han har något slags märke på bröstet som skiljer sig från alla andra du "
"sett\n"
" häromkring."

#: dialog/ccmaster.msg:103
msgid "<Skzzzt-spork> -the armory!"
msgstr ""
msgstr "<Skzzzt-spork> -vapenförrådet!"

#: dialog/ccmaster.msg:104
msgid "What the- <zzzzaaark!>>"
msgstr ""
msgstr "Vad i- <zzzzaaark!>>"

#: dialog/ccmaster.msg:105
msgid ""
"(So, Sarge sent you. Something about needing power armor. Well, all I got is one in for\n"
" maintenance. Might have a few problems still, so take it easy. Just sign here.)"
msgstr ""
"(Så, Sergeanten skickade dig. Nåt om att behöva en kraftrustning. Tja, allt "
"jag har är en inne för\n"
" underhåll. Kan ha några problem fortfarande, så ta det lugnt. Skriv bara "
"under här.)"

#: dialog/ccmaster.msg:106
msgid "Uh... Could you repeat that?"
msgstr ""
msgstr "Eh... Kan du upprepa det?"

#: dialog/ccmaster.msg:107
msgid "I think there's something wrong with your suit."
msgstr ""
msgstr "Jag tror att det är något fel på din rustning."

#: dialog/ccmaster.msg:108
msgid "Sure, I'll do that."
msgstr ""
msgstr "Visst, det ska jag göra."

#: dialog/ccmaster.msg:109
msgid "No way. Forget it."
msgstr ""
msgstr "Inte en chans. Glöm det."

#: dialog/ccmaster.msg:110
msgid "You the guy Arch radioed about?"
msgstr ""
msgstr "E du snubben Arch ropa' in om?"

#: dialog/ccmaster.msg:111
msgid "Are you sure you're not the guy?"
msgstr ""
msgstr "Är du säker på att du inte är killen?"

#: dialog/ccmaster.msg:112 dialog/ccmaster.msg:130 dialog/ccmaster.msg:134
#: dialog/ccmaster.msg:167 dialog/dcaddct2.msg:200 dialog/dcbilly.msg:414
Expand All @@ -19110,7 +19123,7 @@ msgstr "Vadå?"

#: dialog/ccmaster.msg:115 dialog/ccmaster.msg:119 dialog/fcelrind.msg:103
msgid "Who are you? What are you doing here?"
msgstr ""
msgstr "Vem är du? Vad gör du här?"

#: dialog/ccmaster.msg:116 dialog/ccmaster.msg:120 dialog/dcmetzge.msg:215
#: dialog/dcmetzge.msg:682 dialog/dcmetzge.msg:711 dialog/dcorphan.msg:201
Expand All @@ -19122,7 +19135,7 @@ msgstr "Vad?"

#: dialog/ccmaster.msg:117 dialog/ccmaster.msg:121
msgid "Uh... I'm new here?"
msgstr ""
msgstr "Eh... jag är ny här?"

#: dialog/ccmaster.msg:118 dialog/ccmaster.msg:122
msgid "Peek-a-boo!"
Expand All @@ -19133,87 +19146,94 @@ msgid ""
"What do you mean? This suit's working fine! You gonna sign the papers or "
"not?"
msgstr ""
"Vad menar du med det? Den här rustningen fungerar bra! Ska du skriva på "
"papperna eller inte?"

#: dialog/ccmaster.msg:124
msgid "I'm not understanding a word of this."
msgstr ""
msgstr "Jag förstår inte ett ord av det här."

#: dialog/ccmaster.msg:125
msgid "Your speaker's broken."
msgstr ""
msgstr "Din högtalare är trasig."

#: dialog/ccmaster.msg:126 dialog/scratch.msg:104
msgid "Sure, whatever."
msgstr ""
msgstr "Visst."

#: dialog/ccmaster.msg:127
msgid "To hell with this!"
msgstr ""
msgstr "Åt helvete med det här!"

#: dialog/ccmaster.msg:128
msgid "(What, are you deaf? I said I got a suit; just sign here.)"
msgstr ""
msgstr "(Vad, är du döv? Jag sa att jag har en rustning; skriv bara på här.)"

#: dialog/ccmaster.msg:129
msgid ""
"Clown, are you? Well, I don't need this. You explain to Sarge why you don't "
"have a uniform!"
msgstr ""
"Är du en clown? Tja, jag behöver inte det här. Förklara för sergeanten "
"varför du inte har en uniform!"

#: dialog/ccmaster.msg:131
msgid "Okay, fine. I'll do it."
msgstr ""
msgstr "Okej, bra. Jag ska göra det."

#: dialog/ccmaster.msg:132
msgid "Just forget it, okay?"
msgstr ""
msgstr "Glöm det bara, okej?"

#: dialog/ccmaster.msg:133
msgid ""
"Your speaker's not broken. I can hear you just fine. Just sign the papers and we can get this\n"
" done."
msgstr ""
"Din högtalare är inte trasig. Jag hör dig alldeles utmärkt. Skriv bara under "
"papperna så kan vi få det här\n"
" gjort."

#: dialog/ccmaster.msg:135
msgid "Fine, I give up!"
msgstr ""
msgstr "Okej, jag ger upp!"

#: dialog/ccmaster.msg:136
msgid "You want me to what? I'm not that kind of person!"
msgstr ""
msgstr "Du vill att jag ska göra vadå? Jag är inte den sortens person!"

#: dialog/ccmaster.msg:137
msgid "Okay, what's your name?"
msgstr ""
msgstr "Okej, vad heter du?"

#: dialog/ccmaster.msg:138 dialog/ccmaster.msg:152 dialog/ccmaster.msg:190
#: dialog/sccarkid.msg:104 dialog/scsalbob.msg:108
msgid "[Player name]"
msgstr ""
msgstr "[Spelarens namn]"

#: dialog/ccmaster.msg:139 dialog/ccmaster.msg:153
msgid "Pisces?"
msgstr "Fiskarna?"

#: dialog/ccmaster.msg:140
msgid "I want the power armor."
msgstr ""
msgstr "Jag vill ha kraftrustningen."

#: dialog/ccmaster.msg:141 dialog/ccmaster.msg:154
msgid "Swordfish."
msgstr "Svärdfisk."

#: dialog/ccmaster.msg:142
msgid "Right. Unit?"
msgstr ""
msgstr "Okej. Enhet?"

#: dialog/ccmaster.msg:143 dialog/ccmaster.msg:157 dialog/ccmaster.msg:181
msgid "Arroyo."
msgstr "Arroyo."

#: dialog/ccmaster.msg:145 dialog/ccmaster.msg:183
msgid "I got better."
msgstr ""
msgstr "Jag blev bättre."

#: dialog/ccmaster.msg:146 dialog/ccmaster.msg:158 dialog/ccmaster.msg:184
msgid "42."
Expand Down Expand Up @@ -19264,19 +19284,19 @@ msgstr "Inte."
#: dialog/ccmaster.msg:165
msgid ""
"Okay, let's make this quick. Take that off and I'll give you a new suit."
msgstr ""
msgstr "Okej, nu skyndar vi på. Ta av dig den där så får du en ny kostym."

#: dialog/ccmaster.msg:166
msgid "You're nothing but static."
msgstr ""
msgstr "Jag hör bara sprakande från dig."

#: dialog/ccmaster.msg:169
msgid "You're gonna off me? I don't think so!"
msgstr ""
msgstr "Tänker du döda mig? Jag tror inte det!"

#: dialog/ccmaster.msg:170
msgid "Oh, well never mind."
msgstr ""
msgstr "Åh, ja, glöm det."

#: dialog/ccmaster.msg:171
msgid "The power armor. Give me the power armor, you moron."
Expand Down
2 changes: 1 addition & 1 deletion data/text/russian/dialog/gcenc2.msg
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
{114}{}{Воу, воу, постойте! Почему вы не верите мне? Хоть скажите, что я, по-вашему, натворил?}
{115}{}{Кто-то взломал компьютерную сеть Анклава с терминала реактора Посейдон Ойл. Мы пытаемся разыскать его.}
{116}{}{Взломал что?! Ну, это не мое. Я всего лишь дикарь. Я даже не знаю, как использовать -- как вы это называете? - Ком-пю-теры.}
{200}{}{Гекко? Черт, нет, вы разве не знаете, что это место кишит кривомордыми гулями? Мне и так приходится смотреть за моим дядей Ленни. А почему вы спросили?}
{200}{}{Гекко? Черт, нет, вы разве не знаете, что это место кишит кривомордыми гулями? Мне и так приходится смотреть за моим дядей Ленни. А почему вы спросили?}
{201}{}{Ургх?}
{202}{}{Моя убивать плохих людей!}
2 changes: 1 addition & 1 deletion data/text/russian/dialog/generic.msg
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
{3925}{}{Эй, ты! Что ты там делаешь?}
{3926}{}{Тебе нечего здесь делать!}
{3927}{}{Если ты думаешь, что я тут стою для мебели, подумай еще раз.}
{3928}{}{Если я правильно понимаю, что ты хочешь сделать, даже и не пытайся.}
{3928}{}{Ты лучше не замышляй то, что я думаю, чужак.}
{3929}{}{Что? Тебе вправду казалось, что я тебя не замечу? Убирайся отсюда!}
{3950}{}{}
{3975}{}{}
Expand Down
Loading

0 comments on commit 71f5c5d

Please sign in to comment.