Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ jobs:

- name: Build and run custom-game setup regressions
run: |
scons -j$(nproc) release=1 server=0 custom-setup-test
scons -j$(nproc) release=1 server=0 custom-setup-test map-generator-defaults-test
timeout 60s ./build/src/MapGeneratorDefaultsTest glob2-map-defaults-ci
timeout 180s ./build/src/CustomGameSetupHarness
mkdir -p artifacts/custom-game-ci
timeout 180s xvfb-run -a -s '-screen 0 1024x768x24' ./build/src/CustomGameSetupHarness artifacts/custom-game-ci > artifacts/custom-game-ci/ui.log 2>&1
Expand Down
14 changes: 10 additions & 4 deletions data/texts.ar.txt
Original file line number Diff line number Diff line change
Expand Up @@ -607,9 +607,9 @@ meta-%0
[ok]
ﻧﻌﻢ
[old islands terrain]
ﺟُﺰﺭ ﻋﺸﻮﺍﺋﻴﺔ ﺑﻨﻤﻂ ﻗﺪﻳﻢ
الأرخبيل الوعر
[old random terrain]
ﺗﻀﺎﺭﻳﺲ ﻋﺸﻮﺍﺋﻴﺔ ﺑﻨﻤﻂ ﻗﺪﻳﻢ
الساحل المتشظي
[on press]
ﻋﻨﺪ ﺍﻟﻀﻐﻂ
[On the spot]
Expand Down Expand Up @@ -1361,9 +1361,9 @@ Cortex
[No AI orders]
لا توجد أوامر الذكاء الاصطناعي
[Old islands]
الجزر القديمة
الأرخبيل الوعر
[Old random]
عشوائية قديمة
الساحل المتشظي
[Open at least one colony to start a match.]
افتح مستعمرة واحدة على الأقل لبدء المباراة.
[Open book]
Expand Down Expand Up @@ -1764,3 +1764,9 @@ OpenGL غير متوفر في هذا الإصدار.
عرض الطارة تلقائيًا
[settings Automatically show the torus overview while moving around the map (OpenGL).]
إظهار نظرة عامة للخريطة على سطح طارة تلقائيًا أثناء التنقل في الخريطة (OpenGL).
[Channel width]
عرض القناة
[Land bridge width]
عرض الجسر البري
[Lake size]
حجم البحيرة
14 changes: 10 additions & 4 deletions data/texts.br.txt
Original file line number Diff line number Diff line change
Expand Up @@ -603,9 +603,9 @@ os quais
[ok]
Ok
[old islands terrain]
velhas ilhas aleatórias
Arquipélago Acidentado
[old random terrain]
velho terreno aleatório
Costa Fragmentada
[on press]
Ao apertar
[On the spot]
Expand Down Expand Up @@ -1359,9 +1359,9 @@ Médio - Experimental
[No AI orders]
Sem ordens da IA
[Old islands]
Ilhas (gerador antigo)
Arquipélago Acidentado
[Old random]
Aleatório (gerador antigo)
Costa Fragmentada
[Open at least one colony to start a match.]
Abra pelo menos uma colônia para iniciar uma partida.
[Open book]
Expand Down Expand Up @@ -1762,3 +1762,9 @@ Aplicar os gráficos ao carregar a próxima partida ou o editor de mapas (OpenGL
Visão toroidal automática
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Mostrar automaticamente a visão geral toroidal enquanto você se desloca pelo mapa (OpenGL).
[Channel width]
Largura do canal
[Land bridge width]
Largura da ponte de terra
[Lake size]
Tamanho do lago
14 changes: 10 additions & 4 deletions data/texts.ca.txt
Original file line number Diff line number Diff line change
Expand Up @@ -611,9 +611,9 @@ dels quals
[ok]
OK
[old islands terrain]
illes aleatòries antigues
Arxipèlag Abrupte
[old random terrain]
vell terreny aleatori
Costa Fragmentada
[on press]
En prémer
[On the spot]
Expand Down Expand Up @@ -1371,9 +1371,9 @@ Mitjana - Experimental
[No AI orders]
Sense ordres d'IA
[Old islands]
Illes (generador antic)
Arxipèlag Abrupte
[Old random]
Aleatori (generador antic)
Costa Fragmentada
[Open at least one colony to start a match.]
Obre almenys una colònia per iniciar una partida.
[Open book]
Expand Down Expand Up @@ -1774,3 +1774,9 @@ Aplica els gràfics quan es carregui la propera partida o l’editor de mapes (O
Vista toroidal automàtica
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Mostra automàticament la vista general toroidal mentre us desplaceu pel mapa (OpenGL).
[Channel width]
Amplada del canal
[Land bridge width]
Amplada del pont de terra
[Lake size]
Mida del llac
14 changes: 10 additions & 4 deletions data/texts.cz.txt
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,9 @@ z toho
[ok]
Budiž
[old islands terrain]
náhodné ostrovy (staré)
Členité souostroví
[old random terrain]
náhodný terén (starý)
Roztříštěné pobřeží
[on press]
Stisk
[On the spot]
Expand Down Expand Up @@ -1363,9 +1363,9 @@ Střední – Experimentální
[No AI orders]
Žádné příkazy AI
[Old islands]
Staré ostrovy
Členité souostroví
[Old random]
Staré náhodné
Roztříštěné pobřeží
[Open at least one colony to start a match.]
Otevřete alespoň jednu kolonii a začněte zápas.
[Open book]
Expand Down Expand Up @@ -1766,3 +1766,9 @@ Vybraná grafika se použije při příštím načtení hry nebo editoru map (Op
Automatický toroidní pohled
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Automaticky zobrazovat přehled mapy ve tvaru torusu při pohybu po mapě (OpenGL).
[Channel width]
Šířka průlivu
[Land bridge width]
Šířka pevninského mostu
[Lake size]
Velikost jezera
14 changes: 10 additions & 4 deletions data/texts.de.txt
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,9 @@ wovon
[ok]
Ok
[old islands terrain]
alte Inselzufallskarte
Raues Archipel
[old random terrain]
alte Zufallskarte
Zerklüftete Küste
[on press]
Drücken
[On the spot]
Expand Down Expand Up @@ -1363,9 +1363,9 @@ Mittel – Experimentell
[No AI orders]
Keine KI-Befehle
[Old islands]
Inseln (alter Generator)
Raues Archipel
[Old random]
Zufall (alter Generator)
Zerklüftete Küste
[Open at least one colony to start a match.]
Öffnen Sie mindestens eine Kolonie, um ein Match zu starten.
[Open book]
Expand Down Expand Up @@ -1766,3 +1766,9 @@ Grafik beim nächsten Laden einer Partie oder des Karteneditors anwenden (OpenGL
Automatische Torusansicht
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Zeigt automatisch die torusförmige Kartenübersicht an, während Sie sich auf der Karte bewegen (OpenGL).
[Channel width]
Kanalbreite
[Land bridge width]
Breite der Landbrücke
[Lake size]
Seegröße
14 changes: 10 additions & 4 deletions data/texts.dk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,9 @@ heraf
[ok]
Ok
[old islands terrain]
Gamle tilfældige øer
Barsk øgruppe
[old random terrain]
Gammelt tilfældigt terræn
Opsplittet kyst
[on press]
Ved tryk
[On the spot]
Expand Down Expand Up @@ -1439,9 +1439,9 @@ Medium - Eksperimentel
[No AI orders]
Ingen AI-kommandoer
[Old islands]
Gamle øer
Barsk øgruppe
[Old random]
Gammel tilfældig
Opsplittet kyst
[Open at least one colony to start a match.]
Åbn mindst én koloni for at starte en kamp.
[Open book]
Expand Down Expand Up @@ -1842,3 +1842,9 @@ Anvend grafikken, næste gang et spil eller korteditoren indlæses (OpenGL).
Automatisk torusvisning
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Vis automatisk den torusformede kortoversigt, mens du bevæger dig rundt på kortet (OpenGL).
[Channel width]
Kanalbredde
[Land bridge width]
Landbroens bredde
[Lake size]
Søstørrelse
14 changes: 10 additions & 4 deletions data/texts.en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -619,9 +619,9 @@ there are
[ok]
Ok
[old islands terrain]
old random islands
Rugged Archipelago
[old random terrain]
old random terrain
Shattered Coast
[on press]
On Press
[On the spot]
Expand Down Expand Up @@ -1361,9 +1361,9 @@ Medium - Experimental
[No AI orders]
No AI orders
[Old islands]
Old islands
Rugged Archipelago
[Old random]
Old random
Shattered Coast
[Open at least one colony to start a match.]
Open at least one colony to start a match.
[Open book]
Expand Down Expand Up @@ -1764,3 +1764,9 @@ Apply artwork on the next game or editor load (OpenGL).
Automatic torus view
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Automatically show the torus overview while moving around the map (OpenGL).
[Channel width]
Channel width
[Land bridge width]
Land bridge width
[Lake size]
Lake size
14 changes: 10 additions & 4 deletions data/texts.eo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -607,9 +607,9 @@ da kiuj, estas
[ok]
Bone!
[old islands terrain]
Insuloj, Hazarde
Kruta Insularo
[old random terrain]
Tereno, Hazarde
Fragmentita Marbordo
[on press]
Premo
[On the spot]
Expand Down Expand Up @@ -1361,9 +1361,9 @@ Meza - Eksperimenta
[No AI orders]
Neniuj AI-komandoj
[Old islands]
Insuloj (malnova generatoro)
Kruta Insularo
[Old random]
Hazarda (malnova generatoro)
Fragmentita Marbordo
[Open at least one colony to start a match.]
Malfermu almenaŭ unu kolonion por komenci matĉon.
[Open book]
Expand Down Expand Up @@ -1764,3 +1764,9 @@ La bildoj estos aplikitaj ĉe la sekva ŝargo de ludo aŭ mapredaktilo (OpenGL).
Aŭtomata tora vido
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Aŭtomate montru la torforman superrigardon de la mapo dum moviĝado tra la mapo (OpenGL).
[Channel width]
Larĝo de kanalo
[Land bridge width]
Larĝo de terponto
[Lake size]
Grandeco de lago
14 changes: 10 additions & 4 deletions data/texts.es.txt
Original file line number Diff line number Diff line change
Expand Up @@ -607,9 +607,9 @@ de las cuales
[ok]
Aceptar
[old islands terrain]
Antiguas islas aleatorias
Archipiélago Escarpado
[old random terrain]
Antiguo terreno aleatorio
Costa Fragmentada
[on press]
Al pulsar
[On the spot]
Expand Down Expand Up @@ -1363,9 +1363,9 @@ Medio - Experimental
[No AI orders]
Sin comandos de IA
[Old islands]
Islas (generador antiguo)
Archipiélago Escarpado
[Old random]
Aleatorio (generador antiguo)
Costa Fragmentada
[Open at least one colony to start a match.]
Abre al menos una colonia para comenzar una partida.
[Open book]
Expand Down Expand Up @@ -1766,3 +1766,9 @@ Aplica los gráficos al cargar la próxima partida o el editor de mapas (OpenGL)
Vista toroidal automática
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Muestra automáticamente la vista general toroidal mientras te desplazas por el mapa (OpenGL).
[Channel width]
Anchura del canal
[Land bridge width]
Anchura del puente terrestre
[Lake size]
Tamaño del lago
14 changes: 10 additions & 4 deletions data/texts.eu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,9 @@ hauetatik
[ok]
Ados
[old islands terrain]
ausazko irla lurzoru zaharra
Artxipelago Malkartsua
[old random terrain]
ausazko lurzoru zaharra
Kostalde Zatikatua
[on press]
Sakatzean
[On the spot]
Expand Down Expand Up @@ -1373,9 +1373,9 @@ Ertaina - Esperimentala
[No AI orders]
Ez dago AI komandorik
[Old islands]
Uharte zaharrak
Artxipelago Malkartsua
[Old random]
Ausazko zaharra
Kostalde Zatikatua
[Open at least one colony to start a match.]
Ireki gutxienez kolonia bat partida bat hasteko.
[Open book]
Expand Down Expand Up @@ -1776,3 +1776,9 @@ Erabili hautatutako artelana joko bat edo mapa-editorea kargatzen den hurrengoan
Toroide-ikuspegi automatikoa
[settings Automatically show the torus overview while moving around the map (OpenGL).]
Erakutsi automatikoki toroide formako maparen ikuspegi orokorra mapan mugitzen zaren bitartean (OpenGL).
[Channel width]
Kanalaren zabalera
[Land bridge width]
Lur-zubiaren zabalera
[Lake size]
Aintziraren tamaina
14 changes: 10 additions & 4 deletions data/texts.fa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -607,9 +607,9 @@ numlock
[ok]
قبول!
[old islands terrain]
زمین تصادفی
مجمع‌الجزایر ناهموار
[old random terrain]
مجمع‌الجزایر تصادفی
ساحل گسسته
[on press]
فشارداده
[On the spot]
Expand Down Expand Up @@ -1361,9 +1361,9 @@ Cortex
[No AI orders]
بدون دستور هوش مصنوعی
[Old islands]
جزایر قدیمی
مجمع‌الجزایر ناهموار
[Old random]
تصادفی قدیمی
ساحل گسسته
[Open at least one colony to start a match.]
حداقل یک کلنی را برای شروع مسابقه باز کنید.
[Open book]
Expand Down Expand Up @@ -1764,3 +1764,9 @@ OpenGL در این بیلد موجود نیست.
نمای خودکار چنبره
[settings Automatically show the torus overview while moving around the map (OpenGL).]
هنگام حرکت در نقشه (OpenGL) نمای کلی نقشه به شکل چنبره را به صورت خودکار نشان دهید.
[Channel width]
پهنای آبراه
[Land bridge width]
پهنای پل خشکی
[Lake size]
اندازهٔ دریاچه
Loading
Loading