# HG changeset patch # User Wuzzy # Date 1533728079 -7200 # Node ID cb01913941337f3d97483c592c52a854d82a59c2 # Parent 05dd413393bfaca9b6a753c43b7b18421bfff7ac Use full string for sidFuel and avoid string concatenation Fuel as in fuel for saucer, landgun, flamethrower, icegun. Old string was built with like this: sidFuel + ": " + fuel + "%". New string us built with proper format string instead diff -r 05dd413393bf -r cb0191394133 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Wed Aug 08 13:14:42 2018 +0200 +++ b/hedgewars/uGearsHandlersMess.pas Wed Aug 08 13:34:39 2018 +0200 @@ -4319,7 +4319,7 @@ Gear^.Damage:= i; FreeAndNilTexture(Gear^.Tex); if Gear^.Health <> JETPACK_FUEL_INFINITE then - Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ansistring(': ' + inttostr(i) + '%'), cWhiteColor, fntSmall) + Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], inttostr(i)), cWhiteColor, fntSmall) end; if (HHGear^.Message and (gmAttack or gmUp or gmLeft or gmRight) <> 0) and @@ -5549,8 +5549,8 @@ begin Gear^.Damage:= i; FreeAndNilTexture(Gear^.Tex); - Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ansistring(': ' + inttostr(i) + - '%'), cWhiteColor, fntSmall) + Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], inttostr(i)), + cWhiteColor, fntSmall) end end end; @@ -5632,8 +5632,8 @@ begin Gear^.Damage:= i; FreeAndNilTexture(Gear^.Tex); - Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ansistring(': ' + inttostr(i) + - '%'), cWhiteColor, fntSmall) + Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], inttostr(i)), + cWhiteColor, fntSmall) end end end; @@ -6246,8 +6246,8 @@ begin Gear^.Damage:= t; FreeAndNilTexture(Gear^.Tex); - Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ansistring(': ' + inttostr(t) + - '%'), cWhiteColor, fntSmall) + Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], inttostr(t)), + cWhiteColor, fntSmall) end; if Gear^.Message and (gmUp or gmDown) <> 0 then begin diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/ar.txt --- a/share/hedgewars/Data/Locale/ar.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/ar.txt Wed Aug 08 13:34:39 2018 +0200 @@ -51,7 +51,7 @@ 01:05=خروج (%1/%2)? 01:06=موت مفاجئ 01:07=%1 متبقي -01:08=طاقة +01:08=طاقة: %1% 01:09=تحديث... 01:10=استعمال هذه لن ينهي دورك 01:11=This weapon or utility is not yet available! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/bg.txt --- a/share/hedgewars/Data/Locale/bg.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/bg.txt Wed Aug 08 13:34:39 2018 +0200 @@ -46,7 +46,7 @@ 01:05=Наистина ли напускате (%1/%2)? 01:06=Внезапна смърт! 01:07=%1 остава -01:08=Гориво +01:08=Гориво: %1% ; Event messages ; Hog (%1) умря diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/cs.txt --- a/share/hedgewars/Data/Locale/cs.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/cs.txt Wed Aug 08 13:34:39 2018 +0200 @@ -65,7 +65,7 @@ 01:05=Opravdu ukončit (%1/%2)? 01:06=Náhlá smrt! 01:07=%1 zbývá -01:08=Palivo +01:08=Palivo: %1% 01:09=Synchronizuji... 01:10=Použití tohoto nástroje neukončí tvůj tah! 01:11=Tato zbraň nebo nástroj není dosud povolena! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/da.txt --- a/share/hedgewars/Data/Locale/da.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/da.txt Wed Aug 08 13:34:39 2018 +0200 @@ -65,7 +65,7 @@ 01:05=Vil du virkelig forlade spillet (%1/%2)? 01:06=Pludselig Død! 01:07=%1 tilbage -01:08=Brændstof +01:08=Brændstof: %1% 01:09=Synkroniserer... 01:10=Brug af dette værktøj afslutter ikke din tur! 01:11=Dette våben eller værktøj er ikke tilgængeligt endnu! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/de.txt --- a/share/hedgewars/Data/Locale/de.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/de.txt Wed Aug 08 13:34:39 2018 +0200 @@ -71,7 +71,7 @@ 01:05=Wirklich beenden (%1/%2)? 01:06=Sudden Death! 01:07=%1 verbleibend -01:08=Treibstoff +01:08=Treibstoff: %1% 01:09=Synchronisiere … 01:10=Benutzung beendet nicht die eigene Runde! 01:11=Waffe oder Werkzeug noch nicht verfügbar! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/el.txt --- a/share/hedgewars/Data/Locale/el.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/el.txt Wed Aug 08 13:34:39 2018 +0200 @@ -59,7 +59,7 @@ 01:05=Σίγουρα θέλετε να φύγετε (%1/%2); 01:06=Ξαφνικός Θάνατος! 01:07=%1 απομένουν -01:08=Καύσιμα +01:08=Καύσιμα: %1% 01:09=Συγχρονισμός... 01:10=Χρησιμοποιώντας αυτό το βοήθημα δεν τελειώνει η σειρά σας! 01:11=Αυτό το όπλο ή βοήθημα δεν είναι ακόμα διαθέσιμο! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/en.txt --- a/share/hedgewars/Data/Locale/en.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/en.txt Wed Aug 08 13:34:39 2018 +0200 @@ -71,7 +71,7 @@ 01:05=Really quit? (%1/%2) 01:06=Sudden Death! 01:07=%1 remaining -01:08=Fuel +01:08=Fuel: %1% 01:09=Synchronizing ... 01:10=Using this utility won't end your turn! 01:11=This weapon or utility is not yet available! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/es.txt --- a/share/hedgewars/Data/Locale/es.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/es.txt Wed Aug 08 13:34:39 2018 +0200 @@ -66,7 +66,7 @@ 01:05=¿Seguro que quieres salir (%1 / %2)? 01:06=¡Muerte súbita! 01:07=%1 restante -01:08=Combustible +01:08=Combustible: %1% 01:09=Sincronizando... 01:10=Usar esta herramienta no hará que acabe tu turno. 01:11=Esta herramienta o arma todavía no está disponible. diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/fi.txt --- a/share/hedgewars/Data/Locale/fi.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/fi.txt Wed Aug 08 13:34:39 2018 +0200 @@ -69,7 +69,7 @@ 01:05=Poistutaanko (%1/%2)? 01:06=Äkkikuolema! 01:07=%1 Jäljellä -01:08=Polttoaine +01:08=Polttoaine: %1% 01:09=Synkronoidaan... 01:10=Tämän apuvälineen käyttäminen ei päätä vuoroasi! 01:11=Tämä ase tai apuväline ei ole vielä käytettävissä! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/fr.txt --- a/share/hedgewars/Data/Locale/fr.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/fr.txt Wed Aug 08 13:34:39 2018 +0200 @@ -66,7 +66,7 @@ 01:05=Quitter? (%1/%2) (Cliquer pour reprendre) 01:06=Mort subite ! 01:07=%1 Restantes -01:08=Carburant +01:08=Carburant: %1% ; Event messages ; Hog (%1) died diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/gd.txt --- a/share/hedgewars/Data/Locale/gd.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/gd.txt Wed Aug 08 13:34:39 2018 +0200 @@ -69,7 +69,7 @@ 01:05=Fàgail dha-rìribh? (%1/%2) (Briog gus leantainn air adhart) 01:06=Bàs obann! 01:07=%1 air fhàgail -01:08=Connadh +01:08=Connadh: %1% 01:09=’Ga shioncronachadh… 01:10=Ma chleachdas tu an acainn seo, chan adhbharaich seo crìoch air a’ chuairt agad! 01:11=Chan eil an t-arm no acainn seo ri làimh fhathast! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/gl.txt --- a/share/hedgewars/Data/Locale/gl.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/gl.txt Wed Aug 08 13:34:39 2018 +0200 @@ -50,7 +50,7 @@ 01:05=Saír (%1/%2)? 01:06=Morte súbita! 01:07=%1 restante -01:08=Combustible +01:08=Combustible: %1% 01:09=Sincronizando... ; Mensaxes de eventos diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/hu.txt --- a/share/hedgewars/Data/Locale/hu.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/hu.txt Wed Aug 08 13:34:39 2018 +0200 @@ -51,7 +51,7 @@ 01:05=Valóban Kilépsz? (%1/%2) 01:06=Hirtelen halál! 01:07=%1 maradt -01:08=Töltet +01:08=Töltet: %1% 01:09=Szinkronizálás... 01:10=A kör nem ér véget ennek a használatával! 01:11=Ez a fegyver vagy eszköz még nem elérhető! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/it.txt --- a/share/hedgewars/Data/Locale/it.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/it.txt Wed Aug 08 13:34:39 2018 +0200 @@ -67,7 +67,7 @@ 01:05=Vuoi davvero uscire (%1/%2)? 01:06=Morte improvvisa! 01:07=%1 rimanenti -01:08=Carburante +01:08=Carburante: %1% 01:09=Sincronizzazione... 01:10=L'utilizzo di questa utilità non farà finire il turno! 01:11=Questa arma o utilità non è ancora disponibile! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/ja.txt --- a/share/hedgewars/Data/Locale/ja.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/ja.txt Wed Aug 08 13:34:39 2018 +0200 @@ -65,7 +65,7 @@ 01:05=本当にやめるの (%1/%2)? 01:06=サドンデス! 01:07=%1 残る -01:08=燃料 +01:08=燃料: %1% 01:09=同調中… 01:10=このアイテムは番を終えなくて使えます! 01:11=このアイテムはまだ使えません! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/ko.txt --- a/share/hedgewars/Data/Locale/ko.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/ko.txt Wed Aug 08 13:34:39 2018 +0200 @@ -59,7 +59,7 @@ 01:05=그만둘까요? (%1/%2)? 01:06=단판 결승! 01:07=%1 발 남는다 -01:08=연료 +01:08=연료: %1% 01:09=동시에 발생하고 있다... 01:10=사용하면 회전 계속할 수 있다 01:11=아직 사용할 수가 없다 diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/lt.txt --- a/share/hedgewars/Data/Locale/lt.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/lt.txt Wed Aug 08 13:34:39 2018 +0200 @@ -68,7 +68,7 @@ 01:05=Tikrai išeiti (%1/%2)? 01:06=Maras! 01:07=%1 Liko -01:08=Degalai +01:08=Degalai: %1% 01:09=Kraunasi... 01:10=Naudojant šį įrankį jūsų eilė nepasibaigs! 01:11=Šitas ginklas arba įrankis dar negali būti panaudotas! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/nl.txt --- a/share/hedgewars/Data/Locale/nl.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/nl.txt Wed Aug 08 13:34:39 2018 +0200 @@ -60,7 +60,7 @@ 01:05=Really quit (%1/%2)? 01:06=Sudden Death! 01:07=%1 remaining -01:08=Fuel +01:08=Fuel: %1% 01:09=Synchronizing... 01:10=Using this utility won't end your turn! 01:11=This weapon or utility is not yet available! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/pl.txt --- a/share/hedgewars/Data/Locale/pl.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/pl.txt Wed Aug 08 13:34:39 2018 +0200 @@ -71,7 +71,7 @@ 01:05=Na pewno wyjść (%1/%2)? 01:06=Nagła śmierć! 01:07=%1 strzały pozostał(y) -01:08=Paliwo +01:08=Paliwo: %1% 01:09=Synchronizowanie... 01:10=Użycie tego przedmiotu nie zakończy tury! 01:11=Ta broń/narzędzie nie jest jeszcze dostępna/e! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/pt_BR.txt --- a/share/hedgewars/Data/Locale/pt_BR.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/pt_BR.txt Wed Aug 08 13:34:39 2018 +0200 @@ -67,7 +67,7 @@ 01:05=Realmente sair (%1/%2)? 01:06=Morte Súbita! 01:07=%1 Remanescente -01:08=Combustível +01:08=Combustível: %1% 01:09=Sincronizando... 01:10=Usar esta utilidade não encerrará o turno 01:11=Esta arma ou utilidade ainda não está disponível diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/pt_PT.txt --- a/share/hedgewars/Data/Locale/pt_PT.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/pt_PT.txt Wed Aug 08 13:34:39 2018 +0200 @@ -67,7 +67,7 @@ 01:05=Deseja realmente sair (%1/%2)? 01:06=Morte Súbita! 01:07=%1 restante -01:08=Combustível +01:08=Combustível: %1% 01:09=A sincronizar... 01:10=Usar este utilitário não termina o turno! 01:11=Esta arma ou utilitário ainda não está disponível! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/ro.txt --- a/share/hedgewars/Data/Locale/ro.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/ro.txt Wed Aug 08 13:34:39 2018 +0200 @@ -65,7 +65,7 @@ 01:05=Sigur ieșiți (%1/%2)? 01:06=Moarte subita! 01:07=%1 rămas -01:08=combustibil +01:08=combustibil: %1% 01:09=Sincronizare... 01:10=Folosind această utilitate tura nu se va termina! 01:11=Această armă sau utilitate nu sunt valabile momentan! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/ru.txt --- a/share/hedgewars/Data/Locale/ru.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/ru.txt Wed Aug 08 13:34:39 2018 +0200 @@ -70,7 +70,7 @@ 01:05=Точно выйти (%1/%2)? 01:06=Скоро потоп! 01:07=Ещё %1 -01:08=Топливо +01:08=Топливо: %1% 01:09=Синхронизация... 01:10=Использование этого предмета не завершит твой ход! 01:11=Это оружие или предмет еще недоступно! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/sk.txt --- a/share/hedgewars/Data/Locale/sk.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/sk.txt Wed Aug 08 13:34:39 2018 +0200 @@ -71,7 +71,7 @@ 01:05=Naozaj skončiť (%1/%2)? 01:06=Rýchla smrť! 01:07=%1 Ostáva -01:08=Palivo +01:08=Palivo: %1% 01:09=Synchronizujem... 01:10=Použitím tohto nástroja neskončí váš ťah! 01:11=Táto zbraň alebo nástroj zatiaľ nie je dostupný! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/sv.txt --- a/share/hedgewars/Data/Locale/sv.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/sv.txt Wed Aug 08 13:34:39 2018 +0200 @@ -65,7 +65,7 @@ 01:05=Vill du verkligen avsluta (%1/%2)? 01:06=Sudden death! 01:07=%1 kvar -01:08=Bränsle +01:08=Bränsle: %1% 01:09=Synkroniserar... 01:10=Detta verktyg avslutar inte din tur! 01:11=Detta vapen eller verktyg är inte tillgängligt än! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/tr.txt --- a/share/hedgewars/Data/Locale/tr.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/tr.txt Wed Aug 08 13:34:39 2018 +0200 @@ -67,7 +67,7 @@ 01:05=Çıkılsın mı (%1/%2)? 01:06=Ani ölüm! 01:07=%1 Kaldı -01:08=Yakıt +01:08=Yakıt: %1% 01:09=Eşzamanlanıyor... 01:10=Bu yardımcıyı kullanmak sıranı bitirmeyecek! 01:11=Bu silah veya yardımcı henüz kullanılamıyor! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/uk.txt --- a/share/hedgewars/Data/Locale/uk.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/uk.txt Wed Aug 08 13:34:39 2018 +0200 @@ -68,7 +68,7 @@ 01:05=Точно вийти (%1/%2)? 01:06=Раптова смерть! 01:07=Залишилось %1 -01:08=Пальне +01:08=Пальне: %1% 01:09=Синхронізація... 01:10=Використання цього засобу не завершить хід! 01:11=Ця зброя чи засіб ще не доступний! diff -r 05dd413393bf -r cb0191394133 share/hedgewars/Data/Locale/zh_TW.txt --- a/share/hedgewars/Data/Locale/zh_TW.txt Wed Aug 08 13:14:42 2018 +0200 +++ b/share/hedgewars/Data/Locale/zh_TW.txt Wed Aug 08 13:34:39 2018 +0200 @@ -69,7 +69,7 @@ 01:05=確定要退出 (是%1/否%2)? 01:06=意外死亡模式! 01:07=%1 剩餘 -01:08=燃料 +01:08=燃料: %1% 01:09=同步中... 01:10=使用本工具不會結束回合! 01:11=本武器/工具解凍中!